new tests in dnspbench

git-svn-id: svn://svn.powerdns.com/pdns/trunk/pdns@642 d19b8d6e-7fed-0310-83ef-9ca221ded41b

diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index 3c573a040ef3faf96588fc764e5f8be059fa9b06..f143f7ea3fa39fcc52b32f0dedadda420edb5619 100644 (file)
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -50,7 +50,7 @@ sdig_SOURCES=sdig.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter
 
 dnspbench_SOURCES=dnspbench.cc sstuff.hh dnsparser.cc dnsparser.hh dnsrecords.cc dnswriter.cc dnswriter.hh \
        misc.cc misc.hh rcpgenerator.cc rcpgenerator.hh base64.cc base64.hh unix_utility.cc logger.cc \
-       statbag.cc
+       statbag.cc qtype.cc
 
 
 qgen_SOURCES=resolver.cc resolver.hh misc.cc unix_utility.cc qtype.cc \

diff --git a/pdns/dnspbench.cc b/pdns/dnspbench.cc
index 441ef161a2f0f59f7f356116ae1a84cd8a40d54a..d1b2c9e87833ecb53e49d1e72d00048564d922c5 100644 (file)
--- a/pdns/dnspbench.cc
+++ b/pdns/dnspbench.cc
@@ -1,49 +1,73 @@
+#include "logger.hh"
+Logger L("dnspbench");
+
 #include "dnsparser.hh"
 #include "sstuff.hh"
 #include "misc.hh"
 #include "dnswriter.hh"
 #include "dnsrecords.hh"
-#include "logger.hh"
+
 #include "statbag.hh"
+#include <stdint.h>
 #include <set>
-#define BOOST_NO_MT
 
-#include <boost/pool/pool.hpp>
-#include <boost/pool/object_pool.hpp>
-
-#include <boost/pool/pool_alloc.hpp>
 using namespace boost;
 
-Logger L("dnspbench");
+
 StatBag S;
 
+#include <bits/atomicity.h>
+// This code is ugly but does speedup the recursor tremendously on multi-processor systems, and even has a large effect (20, 30%) on uniprocessor 
+namespace __gnu_cxx
+{
+  _Atomic_word
+  __attribute__ ((__unused__))
+  __exchange_and_add(volatile _Atomic_word* __mem, int __val)
+  {
+    register _Atomic_word __result=*__mem;
+    *__mem+=__val;
+    return __result;
+  }
+
+  void
+  __attribute__ ((__unused__))
+  __atomic_add(volatile _Atomic_word* __mem, int __val)
+  {
+    *__mem+=__val;
+  }
+}
+
+int xcount;
+
 int main(int argc, char** argv)
 try
 {
-  set<int, std::less<int>, boost::pool_allocator<int> > blah;
+  reportAllTypes();
+  Socket s(InterNetwork, Datagram);
 
-  for(unsigned int n=0;n< 1000000;++n)
-    blah.insert(random());
-  cerr<<"Done inserting"<<endl;
-  string line;
-  getline(cin, line);
-  cerr<<"Done!"<<endl;
+  vector<uint8_t> vpacket;
+  string domain="www.ds9a.nl";
+  uint16_t type=1;
+
+  for(unsigned int n=0; n < 1000000; ++n) {
+    DNSPacketWriter pw(vpacket, domain, type);
+    pw.startRecord(domain, 1, 3600, 1, DNSPacketWriter::ANSWER);
+    shared_ptr<DNSRecordContent> drc(DNSRecordContent::mastermake(1, 1, "1.2.3.4"));      
+
+    drc->toPacket(pw);
+    pw.commit();
+    pw.getHeader()->rd=0;
+    //    IPEndpoint rem("127.0.0.1",5300);
+    //    string spacket((char*)(&*vpacket.begin()), vpacket.size());
+    //    s.sendTo(spacket, rem);
+  }
+  cout<<xcount<<endl;
+
+  return 0; 
+#if 0
 
-  exit(0);
 
-  dnsheader dnsheader;
-  dnsheader.qdcount=htons(1);
-  dnsheader.ancount=htons(1);
-  Socket s(InterNetwork, Datagram);
-  string spacket;
-  char* p=(char*)&dnsheader;
-  spacket.assign(p, p+sizeof(dnsheader));
-  IPEndpoint rem("127.0.0.1",5300);
-  s.sendTo(spacket, rem);
-  
-  return 0;
 
-  reportAllTypes();
 
   vector<uint8_t> packet;
 
@@ -61,6 +85,7 @@ try
 
   shared_ptr<DNSRecordContent> regen=DNSRecordContent::unserialize(argv[1], type, record);
   cerr<<"Out: "<<argv[1]<<" IN "<<argv[2]<<" "<<regen->getZoneRepresentation()<<endl;
+#endif
 }
 catch(exception& e)
 {