Changeset 709 for trunk/pdns/pdns/selectmplexer.cc

Timestamp:

04/16/06 21:11:57 (7 years ago)

Author:

ahu

Message:

add epoll mplexer, update selectmplexer

Files:

• trunk/pdns/pdns/selectmplexer.cc (modified) (6 diffs)

trunk/pdns/pdns/selectmplexer.cc

@@ -5 +5 @@
 #include "misc.hh"
 #include <boost/lexical_cast.hpp>
+#include "syncres.hh"
 
 using namespace boost;
+using namespace std;
 
-using namespace std;
+class SelectFDMultiplexer : public FDMultiplexer
+{
+public:
+  SelectFDMultiplexer()
+  {}
+  virtual ~SelectFDMultiplexer()
+  {}
+
+  virtual int run(struct timeval* tv=0);
+
+  virtual void addFD(callbackmap_t& cbmap, int fd, callbackfunc_t toDo, boost::any parameter);
+  virtual void removeFD(callbackmap_t& cbmap, int fd);
+};
+
+
+FDMultiplexer* getMultiplexer()
+{
+  return new SelectFDMultiplexer();
+}
+
 
 void SelectFDMultiplexer::addFD(callbackmap_t& cbmap, int fd, callbackfunc_t toDo, boost::any parameter)
@@ -15 +36 @@
   cb.d_callback=toDo;
   cb.d_parameter=parameter;
+
   if(cbmap.count(fd))
     throw FDMultiplexerException("Tried to add fd "+lexical_cast<string>(fd)+ " to multiplexer twice");
@@ -22 +44 @@
 void SelectFDMultiplexer::removeFD(callbackmap_t& cbmap, int fd)
 {
+  if(d_inrun && d_iter->first==fd)  // trying to remove us!
+    d_iter++;
+
   if(!cbmap.erase(fd))
     throw FDMultiplexerException("Tried to remove unlisted fd "+lexical_cast<string>(fd)+ " from multiplexer");
 }
 
-
 int SelectFDMultiplexer::run(struct timeval* now)
 {
+  if(d_inrun) {
+    throw FDMultiplexerException("FDMultiplexer::run() is not reentrant!\n");
+  }
   fd_set readfds, writefds;
   FD_ZERO(&readfds);
@@ -39 +66 @@
     fdmax=max(i->first, fdmax);
   }
+
+  for(callbackmap_t::const_iterator i=d_writeCallbacks.begin(); i != d_writeCallbacks.end(); ++i) {
+    FD_SET(i->first, &writefds);
+    fdmax=max(i->first, fdmax);
+  }
+
   
   struct timeval tv={0,500000};
@@ -51 +84 @@
     return 0;
 
+  d_iter=d_readCallbacks.end();
   d_inrun=true;
-  d_newReadCallbacks=d_readCallbacks;
-  d_newWriteCallbacks=d_writeCallbacks;
+  
+  for(callbackmap_t::iterator i=d_readCallbacks.begin(); i != d_readCallbacks.end() && i->first <= fdmax; ) {
+    d_iter=i++;
 
-  for(callbackmap_t::iterator i=d_readCallbacks.begin(); i != d_readCallbacks.end(); ++i) {
-    if(FD_ISSET(i->first, &readfds))
-      i->second.d_callback(i->first, i->second.d_parameter);
-  }
-  for(callbackmap_t::iterator i=d_writeCallbacks.begin(); i != d_writeCallbacks.end(); ++i) {
-    if(FD_ISSET(i->first, &writefds))
-      i->second.d_callback(i->first, i->second.d_parameter);
+    if(FD_ISSET(d_iter->first, &readfds)) {
+      d_iter->second.d_callback(d_iter->first, d_iter->second.d_parameter);
+    }
   }
 
-  d_readCallbacks.swap(d_newReadCallbacks);
-  d_writeCallbacks.swap(d_newWriteCallbacks);
+  for(callbackmap_t::iterator i=d_writeCallbacks.begin(); i != d_writeCallbacks.end() && i->first <= fdmax; ) {
+    d_iter=i++;
+    if(FD_ISSET(d_iter->first, &writefds)) {
+      d_iter->second.d_callback(d_iter->first, d_iter->second.d_parameter);
+    }
+  }
 
   d_inrun=false;
-  
   return 0;
 }
+
+#if 0
 
 void acceptData(int fd, boost::any& parameter)
@@ -82 +118 @@
 }
 
-#if 0
+
 int main()
 {