Changeset 1634

Timestamp:

06/13/10 14:46:34 (3 years ago)

Author:

ahu

Message:

add timeout reporting to inflighter

Location:

trunk/pdns/pdns

Files:

• dnsbulktest.cc (modified) (5 diffs)
• inflighter.cc (modified) (1 diff)

trunk/pdns/pdns/dnsbulktest.cc

@@ -1 +1 @@
 #include "inflighter.cc"
+#include <deque>
 #include "namespaces.hh"
 #include "dnsparser.hh"
@@ -21 +22 @@
   typedef DNSResult Answer; // ip 
   int d_socket;
-  uint16_t d_id;
+  deque<uint16_t> d_idqueue;
   
   
@@ -34 +35 @@
     d_oks = d_errors = d_nodatas = d_nxdomains = d_unknowns = 0;
     d_receiveds = d_receiveerrors = 0;
+    for(unsigned int id =0 ; id < numeric_limits<uint16_t>::max(); ++id) 
+      d_idqueue.push_back(id);
   }
   
@@ -50 +53 @@
     DNSPacketWriter pw(packet, domain, QType::A);
     
-    pw.getHeader()->id = d_id++;
+    pw.getHeader()->id = d_idqueue.front();
+    d_idqueue.pop_front();
     pw.getHeader()->rd = 1;
     pw.getHeader()->qr = 0;
@@ -94 +98 @@
     }
     return 0;
+  }
+  
+  void deliverTimeout(const Identifier& id)
+  {
+    d_idqueue.push_back(id);
   }
   

trunk/pdns/pdns/inflighter.cc

@@ -130 +130 @@
         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)) {
+            d_sr.deliverTimeout(valiter->id);  // so backend can release id
             waiters_index.erase(valiter++);
             // cerr<<"Have timeout for id="<< valiter->id <<endl;