Changeset 1402 for trunk/pdns/pdns/pdns_recursor.cc

Timestamp:

09/22/09 12:14:43 (10 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

Files:

• trunk/pdns/pdns/pdns_recursor.cc (modified) (10 diffs)

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";