Changeset 1635 for trunk/pdns/pdns/inflighter.cc

Timestamp:

06/13/10 22:45:28 (3 years ago)

Author:

ahu

Message:

comment the 'inflighter' a bit, plus add very nice statistical output to dnsbulktest
see  http://bert-hubert.blogspot.com/2010/06/better-statistical-regression-tests.html

Files:

• trunk/pdns/pdns/inflighter.cc (modified) (9 diffs)

trunk/pdns/pdns/inflighter.cc

@@ -31 +31 @@
     d_init=true;
   }
-  void run();
+  
+  bool run(); //!< keep calling this as long as it returns 1, or if it throws an exception 
   
   unsigned int d_maxInFlight;
@@ -78 +79 @@
 };
 
-template<typename Container, typename SendReceive> void Inflighter<Container, SendReceive>::run()
+template<typename Container, typename SendReceive> bool Inflighter<Container, SendReceive>::run()
 {
   if(!d_init)
     init();
     
-  // cout << "Have "<<d_container.size() << " things to do!"<<endl;
-  
   for(;;) {
     int burst = 0;
+
+    // 'send' as many items as allowed, limited by 'max in flight' and our burst parameter (which limits query rate growth)
     while(d_iter != d_container.end() && d_ttdWatch.size() < d_maxInFlight) { 
       TTDItem ttdi;
@@ -93 +94 @@
       gettimeofday(&ttdi.ttd, 0);
       ttdi.ttd.tv_sec += d_timeoutSeconds;
-      
+      if(d_ttdWatch.count(ttdi.id)) {
+//        cerr<<"DUPLICATE INSERT!"<<endl;
+      }
       d_ttdWatch.insert(ttdi);
       
@@ -100 +103 @@
     }
     int processed=0;
+    
+    
+    // if there are queries in flight, handle responses
     if(!d_ttdWatch.empty()) {
       // cerr<<"Have "<< d_ttdWatch.size() <<" queries in flight"<<endl;            
@@ -105 +111 @@
       typename SendReceive::Identifier id;
       
+      // get as many answers as available - 'receive' should block for a short while to wait for an answer
       while(d_sr.receive(id, answer)) {
-        typename ttdwatch_t::iterator ival = d_ttdWatch.find(id);
-        if(ival != d_ttdWatch.end()) {
+        typename ttdwatch_t::iterator ival = d_ttdWatch.find(id); // match up what we received to what we were waiting for
+
+        if(ival != d_ttdWatch.end()) { // found something!
           ++processed;
-          // cerr<<"Received expected item with id '"<<id<<"' and value '"<<item<<"'"<<endl;
-          d_sr.deliverAnswer(*ival->iter, answer);
+          d_sr.deliverAnswer(*ival->iter, answer);    // deliver to sender/receiver
           d_ttdWatch.erase(ival);
           break; // we can send new questions!
@@ -121 +128 @@
     
       
-      if(!processed) { // no new responses, time for some cleanup
+      if(!processed /* || d_ttdWatch.size() > 10000 */ ) { // no new responses, time for some cleanup of the ttdWatch
         struct timeval now;
         gettimeofday(&now, 0);
@@ -128 +135 @@
         waiters_by_ttd_index_t& waiters_index = boost::multi_index::get<TimeTag>(d_ttdWatch);
 
+        // this provides a list of items sorted by age
         for(typename waiters_by_ttd_index_t::iterator valiter = waiters_index.begin(); valiter != waiters_index.end(); ) {
           if(valiter->ttd.tv_sec < now.tv_sec || (valiter->ttd.tv_sec == now.tv_sec && valiter->ttd.tv_usec < now.tv_usec)) {
@@ -136 +144 @@
           }
           else 
-            break;
+            break; // if this one was too new, rest will be too
         }
       }
@@ -143 +151 @@
       break;
   }
+  return false;
 }