Implement feature in bug #395 reported by stealth, and tidy up a bit

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index a26c28e517d77e2c0badd8bbf507a602f6aef5d4..b87d2769d6dd969b275995b8758ac1a8388e9ed7 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.
  *
@@ -21,7 +18,6 @@
 
 SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
-       ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
        EngineHandle = 0;
        CurrentSetSize = 0;
        memset(writeable, 0, sizeof(writeable));
@@ -29,22 +25,16 @@ SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 
 SelectEngine::~SelectEngine()
 {
-       ServerInstance->Log(DEBUG,"SelectEngine::~SelectEngine()");
 }
 
 bool SelectEngine::AddFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
-       {
-               ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
-       }
+
        if (GetRemainingFds() <= 1)
-       {
-               ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
                return false;
-       }
 
        fds[fd] = fd;
 
@@ -52,9 +42,10 @@ bool SelectEngine::AddFd(EventHandler* eh)
                return false;
 
        ref[fd] = eh;
-       ServerInstance->Log(DEBUG,"Add socket %d",fd);
 
        CurrentSetSize++;
+
+       ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
        return true;
 }
 
@@ -63,24 +54,21 @@ void SelectEngine::WantWrite(EventHandler* eh)
        writeable[eh->GetFd()] = true;
 }
 
-bool SelectEngine::DelFd(EventHandler* eh)
+bool SelectEngine::DelFd(EventHandler* eh, bool force)
 {
        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;
+
+       ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }
 
@@ -100,6 +88,8 @@ int SelectEngine::DispatchEvents()
        timeval tval;
        int sresult = 0;
        EventHandler* ev[MAX_DESCRIPTORS];
+       socklen_t codesize;
+       int errcode;
 
        FD_ZERO(&wfdset);
        FD_ZERO(&rfdset);
@@ -116,8 +106,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)
        {
@@ -139,24 +129,30 @@ int SelectEngine::DispatchEvents()
        {
                if (ev[i])
                {
-                       if (FD_ISSET (a->second, &errfdset))
+                       if (FD_ISSET (ev[i]->GetFd(), &errfdset))
                        {
                                if (ev[i])
-                                       ev[i]->HandleEvent(EVENT_ERROR, 0);
+                               {
+                                       if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+                                               errcode = errno;
+
+                                       ev[i]->HandleEvent(EVENT_ERROR, errcode);
+                               }
                                continue;
                        }
-                       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])
                        {
-                               if (ev[i])
-                                       ev[i]->HandleEvent(EVENT_WRITE);
-                               writeable[ev[i]->GetFd()] = false;
-       
-                       }
-                       else
-                       {
-                               if (ev[i])
-                                       ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+                               if (writeable[ev[i]->GetFd()])
+                               {
+                                       writeable[ev[i]->GetFd()] = false;
+                                       if (ev[i])
+                                               ev[i]->HandleEvent(EVENT_WRITE);
+                               }
+                               else
+                               {
+                                       if (ev[i])
+                                               ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+                               }
                        }
                }
        }