Move whowas containers into whowas class to avoid all cpp files including cmd_whowas...

[user/henk/code/inspircd.git] / src / socketengine_select.cpp

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index d2481f9cc045f442a4f0ee6f63259e05802a464d..2be16b282d01ff9f742fd11d897782f86eb08fca 100644 (file)
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -67,17 +64,12 @@ bool SelectEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
-       ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
-
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
 
        std::map<int,int>::iterator t = fds.find(fd);
        if (t != fds.end())
-       {
                fds.erase(t);
-               ServerInstance->Log(DEBUG,"Deleted fd %d",fd);
-       }
 
        CurrentSetSize--;
        ref[fd] = NULL;
@@ -118,8 +110,8 @@ int SelectEngine::DispatchEvents()
 
                FD_SET (a->second, &errfdset);
        }
-       tval.tv_sec = 0;
-       tval.tv_usec = 50L;
+       tval.tv_sec = 1;
+       tval.tv_usec = 0;
        sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
        if (sresult > 0)
        {
@@ -154,7 +146,6 @@ int SelectEngine::DispatchEvents()
                        }
                        if (ev[i])
                        {
-                               ServerInstance->Log(DEBUG,"Handle %s event on fd %d",writeable[ev[i]->GetFd()] || !ev[i]->Readable() ? "write" : "read", ev[i]->GetFd());
                                if (writeable[ev[i]->GetFd()])
                                {
                                        if (ev[i])