Changeset 1115

Timestamp:

12/29/07 14:38:11 (10 months ago)

Author:

ahu

Message:

fix subtle bug where waiting for an fd to become writable immediately after waiting for it to be readable would return immediate success, which hurt TCP queries

Files:

• trunk/pdns/pdns/epollmplexer.cc (modified) (4 diffs)
• trunk/pdns/pdns/kqueuemplexer.cc (modified) (1 diff)
• trunk/pdns/pdns/portsmplexer.cc (modified) (1 diff)
• trunk/pdns/pdns/selectmplexer.cc (modified) (1 diff)

trunk/pdns/pdns/epollmplexer.cc

@@ -113 +113 @@
-  
-  if(ret < 0 && errno!=EINTR)
-select
+epoll
-
-  if(ret < 1) // thanks AB!
@@ -119 +119 @@
-
-  d_inrun=true;
-
-  for(int n=0; n < ret; ++n) {
-    d_iter=d_readCallbacks.find(d_eevents[n].data.fd);
@@ -125 +124 @@
-    if(d_iter != d_readCallbacks.end()) {
-      d_iter->second.d_callback(d_iter->first, d_iter->second.d_parameter);
+      continue; // so we don't refind ourselves as writable!
-    }
-
-    d_iter=d_writeCallbacks.find(d_eevents[n].data.fd);
-    
@@ -133 +132 @@
-    }
-  }
-
-  d_inrun=false;
-  return 0;

trunk/pdns/pdns/kqueuemplexer.cc

@@ -108 +108 @@
-    if(d_iter != d_readCallbacks.end()) {
-      d_iter->second.d_callback(d_iter->first, d_iter->second.d_parameter);
+      continue; // so we don't find ourselves as writable again
-    }
-

trunk/pdns/pdns/portsmplexer.cc

@@ -118 +118 @@
-                        POLLIN, 0) < 0)
-        throw FDMultiplexerException("Unable to add fd back to ports (read): "+stringerror());
+      continue; // so we don't find ourselves as writable again
-    }
-

trunk/pdns/pdns/selectmplexer.cc

@@ -82 +82 @@
-    if(FD_ISSET(d_iter->first, &readfds)) {
-      d_iter->second.d_callback(d_iter->first, d_iter->second.d_parameter);
+      continue;  // so we don't refind ourselves as writable
-    }
-  }