Changeset 1268

Timestamp:

11/15/08 20:30:56 (5 years ago)

Author:

ahu

Message:

make dnsreplay deal with 'the final few packets' so very small pcap files can be analysed too

Files:

• trunk/pdns/pdns/dnsreplay.cc (modified) (5 diffs)

trunk/pdns/pdns/dnsreplay.cc

@@ -70 +70 @@
 
 po::variables_map g_vm;
-
 
 const struct timeval operator*(float fact, const struct timeval& rhs)
@@ -415 +414 @@
 
 
-void houseKeeping()
-{
-  static timeval last;
-
-  struct timeval now;
-  gettimeofday(&now, 0);
-
-  if(DiffTime(last, now) < 0.3)
-    return;
-
-  int weWaitingFor, origWaitingFor, weSlow, origSlow;
-  WeOrigSlowQueriesDelta(weWaitingFor, origWaitingFor, weSlow, origSlow);
-    
-  if(!g_throttled) {
-    if( weWaitingFor > 1000) {
-      cerr<<"Too many questions ("<<weWaitingFor<<") outstanding, throttling"<<endl;
-      g_throttled=true;
-    }
-  }
-  else if(weWaitingFor < 750) {
-    cerr<<"Unthrottling ("<<weWaitingFor<<")"<<endl;
-    g_throttled=false;
-  }
-
-  if(DiffTime(last, now) < 2)
-    return;
-
-  last=now;
-
-  /*
-        Questions - Pend. - Drop = Answers = (On time + Late) = (Err + Ok)
-Orig    9           21      29     36         47        57       66    72
-
-
-   */
+void printStats(uint64_t origWaitingFor=0, uint64_t weWaitingFor=0)
+{
 
   format headerfmt   ("%|9t|Questions - Pend. - Drop = Answers = (On time + Late) = (Err + Ok)\n");
@@ -467 +433 @@
   cerr<<"Unmatched from us: "<<s_weunmatched<<", unmatched from original: "<<s_origunmatched << " ( - decoding err: "<<s_origunmatched-s_origdnserrors<<")"<<endl;
   cerr<<"DNS decoding errors from us: "<<s_wednserrors<<", from original: "<<s_origdnserrors<<", exact duplicates from client: "<<s_duplicates<<endl<<endl;
+
+}
+
+void houseKeeping()
+{
+  static timeval last;
+
+  struct timeval now;
+  gettimeofday(&now, 0);
+
+  if(DiffTime(last, now) < 0.3)
+    return;
+
+  int weWaitingFor, origWaitingFor, weSlow, origSlow;
+  WeOrigSlowQueriesDelta(weWaitingFor, origWaitingFor, weSlow, origSlow);
+    
+  if(!g_throttled) {
+    if( weWaitingFor > 1000) {
+      cerr<<"Too many questions ("<<weWaitingFor<<") outstanding, throttling"<<endl;
+      g_throttled=true;
+    }
+  }
+  else if(weWaitingFor < 750) {
+    cerr<<"Unthrottling ("<<weWaitingFor<<")"<<endl;
+    g_throttled=false;
+  }
+
+  if(DiffTime(last, now) < 2)
+    return;
+
+  last=now;
+
+  /*
+        Questions - Pend. - Drop = Answers = (On time + Late) = (Err + Ok)
+Orig    9           21      29     36         47        57       66    72
+
+
+   */
+
+  printStats(origWaitingFor, weWaitingFor);
 
   pruneQids();
@@ -601 +607 @@
 
   g_rdSelector = g_vm["recursive"].as<bool>();
+
   g_quiet = g_vm["quiet"].as<bool>();
 
@@ -654 +661 @@
   }
  out:;
+  sleep(1);
+  receiveFromReference();
+  printStats();
 }
 catch(exception& e)