Changeset 1402

Timestamp:

09/22/09 12:14:43 (6 months ago)

Author:

ahu

Message:

implement timeouts with millisecond resolution, and raise the default timeout to 1500 msec.
In addition, the previous code may not actually have been delivering the "1 second" timeout accurately, this is now fixed

Location:

trunk/pdns/pdns

Files:

• dnsreplay.cc (modified) (1 diff)
• lwres.cc (modified) (1 diff)
• lwres.hh (modified) (1 diff)
• misc.hh (modified) (1 diff)
• mtasker.cc (modified) (6 diffs)
• mtasker.hh (modified) (4 diffs)
• pdns_recursor.cc (modified) (10 diffs)

trunk/pdns/pdns/dnsreplay.cc

@@ -100 +100 @@
 
 
-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);
-}
 
 

trunk/pdns/pdns/lwres.cc

@@ -106 +106 @@
     
     ret=arecvfrom(reinterpret_cast<char *>(buf.get()), bufsize-1,0, ip, &len, pw.getHeader()->id, 
-                  domain, type, queryfd, now->tv_sec);
+                  domain, type, queryfd, now);
   }
   else {

trunk/pdns/pdns/lwres.hh

@@ -44 +44 @@
             const string& domain, uint16_t qtype,  int* fd);
 int arecvfrom(char *data, int len, int flags, const ComboAddress& ip, int *d_len, uint16_t id, 
-              const string& domain, uint16_t, int fd, unsigned int now);
+              const string& domain, uint16_t, int fd, struct timeval* now);
 
 class LWResException : public AhuException

trunk/pdns/pdns/misc.hh

@@ -304 +304 @@
   return tv.tv_sec + tv.tv_usec/1000000.0f;
 }
+
+inline 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);
+}
+
 struct CIStringCompare: public binary_function<string, string, bool>  
 {

trunk/pdns/pdns/mtasker.cc

@@ -159 +159 @@
 */
 
-template<class EventKey, class EventVal>int MTasker<EventKey,EventVal>::waitEvent(EventKey &key, EventVal *val, unsigned int timeout, unsigned int now)
+template<class EventKey, class EventVal>int MTasker<EventKey,EventVal>::waitEvent(EventKey &key, EventVal *val, unsigned int timeoutMsec, struct timeval* now)
 {
   if(d_waiters.count(key)) { // there was already an exact same waiter
@@ -167 +167 @@
   Waiter w;
   w.context=new ucontext_t;
-  w.ttd=0;
-  if(timeout)
-    w.ttd= timeout + (now ? now : time(0));
+  w.ttd.tv_sec = 0; w.ttd.tv_usec = 0;
+  if(timeoutMsec) {
+    struct timeval increment;
+    increment.tv_sec = timeoutMsec / 1000;
+    increment.tv_usec = 1000 * (timeoutMsec % 1000);
+    if(now) 
+      w.ttd = increment + *now;
+    else {
+      struct timeval realnow;
+      gettimeofday(&realnow, 0);
+      w.ttd = increment + realnow;
+    }
+  }
 
   w.tid=d_tid;
-  
   w.key=key;
 
@@ -268 +277 @@
       
 */
-template<class Key, class Val>bool MTasker<Key,Val>::schedule(unsigned int now)
+template<class Key, class Val>bool MTasker<Key,Val>::schedule(struct timeval*  now)
 {
   if(!d_runQueue.empty()) {
@@ -292 +301 @@
   }
   if(!d_waiters.empty()) {
+    struct timeval rnow;
     if(!now)
-      now=time(0);
+      gettimeofday(&rnow, 0);
+    else
+      rnow = *now;
 
     typedef typename waiters_t::template index<KeyTag>::type waiters_by_ttd_index_t;
@@ -300 +312 @@
 
     for(typename waiters_by_ttd_index_t::iterator i=ttdindex.begin(); i != ttdindex.end(); ) {
-      if(i->ttd && (unsigned int)i->ttd < now) {
+      if(i->ttd.tv_sec && i->ttd < rnow) {
         d_waitstatus=TimeOut;
         d_eventkey=i->key;        // pass waitEvent the exact key it was woken for
@@ -312 +324 @@
         delete uc;
       }
-      else if(i->ttd)
+      else if(i->ttd.tv_sec)
         break;
     }

trunk/pdns/pdns/mtasker.hh

@@ -1 +1 @@
 /*
     PowerDNS Versatile Database Driven Nameserver
-    Copyright (C) 2002 - 2006  PowerDNS.COM BV
+    Copyright (C) 2002 - 2009  PowerDNS.COM BV
 
     This program is free software; you can redistribute it and/or modify
@@ -66 +66 @@
     EventKey key;
     ucontext_t *context;
-    time_t ttd;
+    struct timeval ttd;
     int tid;
   };
@@ -74 +74 @@
     indexed_by <
                 ordered_unique<member<Waiter,EventKey,&Waiter::key> >,
-                ordered_non_unique<tag<KeyTag>, member<Waiter,time_t,&Waiter::ttd> >
+                ordered_non_unique<tag<KeyTag>, member<Waiter,struct timeval,&Waiter::ttd> >
                >
   > waiters_t;
@@ -91 +91 @@
 
   typedef void tfunc_t(void *); //!< type of the pointer that starts a thread 
-  int waitEvent(EventKey &key, EventVal *val=0, unsigned int timeout=0, unsigned int now=0);
+  int waitEvent(EventKey &key, EventVal *val=0, unsigned int timeoutMsec=0, struct timeval* now=0);
   void yield();
   int sendEvent(const EventKey& key, const EventVal* val=0);
   void getEvents(std::vector<EventKey>& events);
   void makeThread(tfunc_t *start, void* val);
-  bool schedule(unsigned int now=0);
+  bool schedule(struct timeval* now=0);
   bool noProcesses();
   unsigned int numProcesses();

trunk/pdns/pdns/pdns_recursor.cc

@@ -67 +67 @@
 FDMultiplexer* g_fdm;
 unsigned int g_maxTCPPerClient;
+unsigned int g_networkTimeoutMsec;
 bool g_logCommonErrors;
 shared_ptr<PowerDNSLua> g_pdl;
@@ -85 +86 @@
 g_tcpListenSockets_t g_tcpListenSockets;
 int g_tcpTimeout;
+
 map<int, ComboAddress> g_listenSocketsAddresses;
 struct DNSComboWriter {
@@ -152 +154 @@
   string packet;
 
-  int ret=MT->waitEvent(pident, &packet, 1);
+  int ret=MT->waitEvent(pident, &packet, g_networkTimeoutMsec);
 
   if(!ret || ret==-1) { // timeout
@@ -174 +176 @@
   g_fdm->addReadFD(sock->getHandle(), handleTCPClientReadable, pident);
 
-  int ret=MT->waitEvent(pident,&data,1);
+  int ret=MT->waitEvent(pident, &data, g_networkTimeoutMsec);
   if(!ret || ret==-1) { // timeout
     g_fdm->removeReadFD(sock->getHandle());
@@ -340 +342 @@
   g_fdm->addReadFD(*fd, handleUDPServerResponse, pident);
   ret=send(*fd, data, len, 0);
+  int tmp = errno;
   if(ret < 0)
     g_udpclientsocks.returnSocket(*fd);
+  errno = tmp; // this is for logging purposes only
   return ret;
 }
@@ -347 +351 @@
 // -1 is error, 0 is timeout, 1 is success
 int arecvfrom(char *data, int len, int flags, const ComboAddress& fromaddr, int *d_len, 
-              uint16_t id, const string& domain, uint16_t qtype, int fd, unsigned int now)
+              uint16_t id, const string& domain, uint16_t qtype, int fd, struct timeval* now)
 {
   static optional<unsigned int> nearMissLimit;
@@ -361 +365 @@
 
   string packet;
-  int ret=MT->waitEvent(pident, &packet, 1, now);
+  int ret=MT->waitEvent(pident, &packet, g_networkTimeoutMsec, now);
 
   if(ret > 0) {
@@ -1811 +1815 @@
   }
   
+  g_networkTimeoutMsec = ::arg().asNum("network-timeout");
   parseAuthAndForwards();
 
@@ -1895 +1900 @@
   
   for(;;) {
-    while(MT->schedule(g_now.tv_sec)); // housekeeping, let threads do their thing
+    while(MT->schedule(&g_now)); // housekeeping, let threads do their thing
       
     if(!(counter%500)) {
@@ -1993 +1998 @@
     ::arg().set("setgid","If set, change group id to this gid for more security")="";
     ::arg().set("setuid","If set, change user id to this uid for more security")="";
+    ::arg().set("network-timeout", "Wait this nummer of milliseconds for network i/o")="1500";
 #ifdef WIN32
     ::arg().set("quiet","Suppress logging of questions and answers")="off";