OOPS! We try again, since I'm smoking craq. LF is 0x0a NOT CR.

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index e0e47b8ebaf696f7a7c0312f23c6039f9372eadd..ef5f2071f82aa2853f9cab99e4435daf36a23db0 100644 (file)
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -2,52 +2,39 @@
  *       | 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.
  *
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "globals.h"
 #include "inspircd.h"
-#include <vector>
-#include <string>
 #include <sys/select.h>
 #include "socketengine_select.h"
 
 
 SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
-       ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
        EngineHandle = 0;
        CurrentSetSize = 0;
+       memset(writeable, 0, sizeof(writeable));
 }
 
 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;
 
@@ -55,30 +42,33 @@ 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;
 }
 
-bool SelectEngine::DelFd(EventHandler* eh)
+void SelectEngine::WantWrite(EventHandler* eh)
 {
-       int fd = eh->GetFd();
+       writeable[eh->GetFd()] = true;
+}
 
-       ServerInstance->Log(DEBUG,"SelectEngine::DelFd(%d)",fd);
+bool SelectEngine::DelFd(EventHandler* eh, bool force)
+{
+       int fd = eh->GetFd();
 
        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;
 }
 
@@ -97,31 +87,33 @@ int SelectEngine::DispatchEvents()
        int result = 0;
        timeval tval;
        int sresult = 0;
-       EventHandler* ev[MAX_DESCRIPTOR];
+       EventHandler* ev[MAX_DESCRIPTORS];
+       socklen_t codesize;
+       int errcode;
 
        FD_ZERO(&wfdset);
        FD_ZERO(&rfdset);
+       FD_ZERO(&errfdset);
 
        for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
        {
                if (ref[a->second]->Readable())
-               {
                        FD_SET (a->second, &rfdset);
-               }
                else
-               {
                        FD_SET (a->second, &wfdset);
-               }
-               
+               if (writeable[a->second])
+                       FD_SET (a->second, &wfdset);
+
+               FD_SET (a->second, &errfdset);
        }
-       tval.tv_sec = 0;
-       tval.tv_usec = 50L;
-       sresult = select(FD_SETSIZE, &rfdset, &wfdset, NULL, &tval);
+       tval.tv_sec = 1;
+       tval.tv_usec = 0;
+       sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
        if (sresult > 0)
        {
                for (std::map<int,int>::iterator a = fds.begin(); a != fds.end(); a++)
                {
-                       if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)))
+                       if ((FD_ISSET (a->second, &rfdset)) || (FD_ISSET (a->second, &wfdset)) || FD_ISSET (a->second, &errfdset))
                        {
                                ev[result++] = ref[a->second];
                        }
@@ -135,8 +127,35 @@ int SelectEngine::DispatchEvents()
         */
        for (int i = 0; i < result; i++)
        {
-               ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ev[i]->Readable() ? "read" : "write", ev[i]->GetFd());
-               ev[i]->HandleEvent(ev[i]->Readable() ? EVENT_READ : EVENT_WRITE);
+               if (ev[i])
+               {
+                       if (FD_ISSET (ev[i]->GetFd(), &errfdset))
+                       {
+                               if (ev[i])
+                               {
+                                       if (getsockopt(ev[i]->GetFd(), SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+                                               errcode = errno;
+
+                                       ev[i]->HandleEvent(EVENT_ERROR, errcode);
+                               }
+                               continue;
+                       }
+                       if (ev[i])
+                       {
+                               if (writeable[ev[i]->GetFd()])
+                               {
+                                       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);
+                               }
+                       }
+               }
        }
 
        return result;