Changeset 468

Timestamp:

09/02/05 15:11:12 (8 years ago)

Author:

ahu

Message:

move to new 'wait with select' system

Files:

• trunk/pdns/pdns/dnsreplay-mindex.cc (modified) (8 diffs)

trunk/pdns/pdns/dnsreplay-mindex.cc

@@ -21 +21 @@
 What to do with timeouts. We keep around at most 65536 outstanding answers. 
 */
+
+
+/* 
+   mental_clock=0;
+   for(;;) {
+
+   do {
+      read a packet
+      send a packet
+    } while(time_of_last_packet_sent < mental_clock) 
+    mental_clock=time_of_last_packet_sent;
+
+    wait for a response packet for 0.1 seconds
+    note how much time has passed
+    mental_clock+=time_passed;
+   }
+
+ */
 
 #include <pcap.h>
@@ -44 +62 @@
 bool s_quiet=true;
 
+
+void normalizeTV(struct timeval& tv)
+{
+  if(tv.tv_usec > 1000000) {
+    ++tv.tv_sec;
+    tv.tv_usec-=1000000;
+  }
+  else if(tv.tv_usec < 0) {
+    --tv.tv_sec;
+    tv.tv_usec+=1000000;
+  }
+}
+
+const struct timeval operator+(const struct timeval& lhs, const struct timeval& rhs)
+{
+  struct timeval ret;
+  ret.tv_sec=lhs.tv_sec + rhs.tv_sec;
+  ret.tv_usec=lhs.tv_usec + rhs.tv_usec;
+  normalizeTV(ret);
+  return ret;
+}
+
+const struct timeval operator-(const struct timeval& lhs, const struct timeval& rhs)
+{
+  struct timeval ret;
+  ret.tv_sec=lhs.tv_sec - rhs.tv_sec;
+  ret.tv_usec=lhs.tv_usec - rhs.tv_usec;
+  normalizeTV(ret);
+  return ret;
+}
+
+const struct timeval operator*(int fact, const struct timeval& rhs)
+{
+  //  cout<<"In: "<<rhs.tv_sec<<" + "<<rhs.tv_usec<<"\n";
+  struct timeval ret;
+  if( (2000000000 / fact) < rhs.tv_usec) {
+    double d=1.0 * rhs.tv_usec * fact;
+    ret.tv_sec=fact * rhs.tv_sec;
+    ret.tv_sec+=(int) (d/1000000);
+    d/=1000000;
+    d-=(int)d;
+
+    ret.tv_usec=1000000*d;
+    normalizeTV(ret);
+    
+    cout<<"out complex: "<<ret.tv_sec<<" + "<<ret.tv_usec<<"\n";
+    
+    return ret;
+  }
+
+  ret.tv_sec=rhs.tv_sec * fact;
+  ret.tv_usec=rhs.tv_usec * fact;
+
+  normalizeTV(ret);
+  //  cout<<"out simple: "<<ret.tv_sec<<" + "<<ret.tv_usec<<"\n";
+  return ret;
+}
+
+
+bool operator<(const struct timeval& lhs, const struct timeval& rhs) 
+{
+  return make_pair(lhs.tv_sec, lhs.tv_usec) < make_pair(rhs.tv_sec, rhs.tv_usec);
+}
+
+
+
+
 class DNSIDManager : public boost::noncopyable
 {
@@ -63 +148 @@
     }
     else
-      throw runtime_error("out of ids!");
+      throw runtime_error("out of ids!"); // XXX FIXME
   }
 
@@ -249 +334 @@
   IPEndpoint remote;
 
+  int res=waitForData(s_socket->getHandle(), 0, 25000);
+  if(res < 0 || res==0)
+    return;
+
   while(s_socket->recvFromAsync(packet, remote)) {
     try {
@@ -286 +375 @@
     }
   }
+
 }
 catch(exception& e)
@@ -413 +503 @@
       dh->id=htons(qd.d_assignedID);
 
+#if 0
       if(lastsent.tv_sec && (!(s_questions%25))) {
         double seconds=pr.d_pheader.ts.tv_sec - lastsent.tv_sec;
@@ -440 +531 @@
       
       //        cout<<"sending!"<<endl;
+#endif
       s_socket->sendTo(string(pr.d_payload, pr.d_payload + pr.d_len), remote);
     }
@@ -503 +595 @@
 
   unsigned int once=0;
+  struct timeval mental_time;
+  mental_time.tv_sec=0; mental_time.tv_usec=0;
+
+  if(!pr.getUDPPacket())
+    return 0;
+
   for(;;) {
+
     if(!((once++)%100)) 
       houseKeeping();
 
-    if(!g_throttled) {
+    int count=0;
+    while(pr.d_pheader.ts < mental_time) {
       if(!pr.getUDPPacket())
-        break;
+        goto out;
       
       sendPacketFromPR(pr, remote);
-    }
-    else 
-      usleep(1000); // move to 'swift poll' 
+      count++;
+    } 
+
+    //    cout<<count<<"\n";
+
+    mental_time=pr.d_pheader.ts;
+    struct timeval then, now;
+    gettimeofday(&then,0);
 
     receiveFromReference();
-  }
+
+    gettimeofday(&now, 0);
+
+    mental_time= mental_time + 2*(now-then);
+  }
+ out:;
 }
 catch(exception& e)