Whoops, make /stats s work

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

diff --git a/src/socketengine_select.cpp b/src/socketengine_select.cpp
index 8d0ed446c65d0b0ab534d9584679cc40cb1aa9d9..abc1b953ba3d80f53931f831e3b20c26dc7a74df 100644 (file)
--- a/src/socketengine_select.cpp
+++ b/src/socketengine_select.cpp
@@ -24,6 +24,7 @@ SelectEngine::SelectEngine(InspIRCd* Instance) : SocketEngine(Instance)
        ServerInstance->Log(DEBUG,"SelectEngine::SelectEngine()");
        EngineHandle = 0;
        CurrentSetSize = 0;
+       memset(writeable, 0, sizeof(writeable));
 }
 
 SelectEngine::~SelectEngine()
@@ -57,6 +58,11 @@ bool SelectEngine::AddFd(EventHandler* eh)
        return true;
 }
 
+void SelectEngine::WantWrite(EventHandler* eh)
+{
+       writeable[eh->GetFd()] = true;
+}
+
 bool SelectEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
@@ -94,30 +100,32 @@ int SelectEngine::DispatchEvents()
        timeval tval;
        int sresult = 0;
        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);
+       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];
                        }
@@ -131,8 +139,32 @@ 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;
+                       }
+                       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])
+                                       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;