Changeset 4887 for branches/erijo-dev

Timestamp:

04/12/07 04:20:20 (20 months ago)

Author:

erijo

Message:

Keep a fd_set around instead of always creating it from scratch.

Location:

branches/erijo-dev/licq/src/event

Files:

• fdset.cpp (modified) (5 diffs)
• fdset.h (modified) (2 diffs)

branches/erijo-dev/licq/src/event/fdset.cpp

@@ -26 +26 @@
     return;
 
+  bool updateFdSet = false;
+
   if (!RemoveFds.empty())
   {
-    for (TFds::const_iterator it = RemoveFds.begin();
-         it != RemoveFds.end(); ++it)
+    for (TFds::const_iterator it = RemoveFds.begin(); it != RemoveFds.end(); ++it)
     {
       for (TFds::iterator fd = Fds.begin(); fd != Fds.end(); ++fd)
@@ -42 +43 @@
     }
 
+    updateFdSet = true;
     RemoveFds.clear();
   }
@@ -47 +49 @@
   if (!AddFds.empty())
   {
-    for (TFds::const_iterator it = AddFds.begin();
-         it != AddFds.end(); ++it)
+    for (TFds::const_iterator it = AddFds.begin(); it != AddFds.end(); ++it)
     {
       Fds.push_back(*it);
     }
 
+    updateFdSet = true;
     AddFds.clear();
+  }
+
+  // Update cached fd_set if needed
+  if (updateFdSet)
+  {
+    MaxFd = 0;
+    FD_ZERO(&FdSet);
+
+    for (TFds::const_iterator it = Fds.begin(); it != Fds.end(); ++it)
+    {
+      FD_SET((*it)->Fd, &FdSet);
+      MaxFd = std::max(MaxFd, (*it)->Fd);
+    }
   }
 }
 
 Licq::TFdSet::TFdSet()
-  : InFireActive(false)
+  : InFireActive(false), MaxFd(0)
 {
-  // Empty
+  FD_ZERO(&FdSet);
 }
 
@@ -66 +81 @@
 {
   std::for_each(Fds.begin(), Fds.end(), ObjectDeleter());
-}
-
-bool Licq::TFdSet::empty() const
-{
-  return Fds.empty();
-}
-
-size_t Licq::TFdSet::size() const
-{
-  return Fds.size();
 }
 
@@ -114 +119 @@
 {
   assert(set != NULL);
-
-  int maxFd = 0;
-  FD_ZERO(set);
-
-  for (TFds::const_iterator it = Fds.begin(); it != Fds.end(); ++it)
-  {
-    FD_SET((*it)->Fd, set);
-    maxFd = std::max(maxFd, (*it)->Fd);
-  }  
-
-  return maxFd;
+  ::memcpy(set, &FdSet, sizeof(fd_set));
+  return MaxFd;
 }
 

branches/erijo-dev/licq/src/event/fdset.h

@@ -47 +47 @@
   void addRemoveFds();
 
+  fd_set FdSet;
+  int MaxFd;
+
 public:
   TFdSet();
@@ -63 +66 @@
 } // namespace Licq
 
+inline bool Licq::TFdSet::empty() const
+{
+  return Fds.empty();
+}
+
+inline size_t Licq::TFdSet::size() const
+{
+  return Fds.size();
+}
+
 #endif