Merge pull request #16 from Adam-/insp20

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

diff --git a/src/socketengines/socketengine_select.cpp b/src/socketengines/socketengine_select.cpp
index f089fd698c9a5a228eaf4e47f9a04347d67b137e..acc8f8f09dc7f158c69eacffbf685dbac3f91dc1 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -11,12 +11,32 @@
  * ---------------------------------------------------
  */
 
+#include "inspircd_config.h"
+
 #include "inspircd.h"
+#include "socketengine.h"
+
 #ifndef WINDOWS
 #include <sys/select.h>
 #endif // WINDOWS
-#include "socketengines/socketengine_select.h"
 
+/** A specialisation of the SocketEngine class, designed to use traditional select().
+ */
+class SelectEngine : public SocketEngine
+{
+public:
+       /** Create a new SelectEngine
+        */
+       SelectEngine();
+       /** Delete a SelectEngine
+        */
+       virtual ~SelectEngine();
+       virtual bool AddFd(EventHandler* eh, int event_mask);
+       virtual void DelFd(EventHandler* eh);
+       void OnSetEvent(EventHandler* eh, int, int);
+       virtual int DispatchEvents();
+       virtual std::string GetName();
+};
 
 SelectEngine::SelectEngine()
 {
@@ -32,7 +52,7 @@ SelectEngine::~SelectEngine()
        delete[] ref;
 }
 
-bool SelectEngine::AddFd(EventHandler* eh, int)
+bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
 {
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > GetMaxFds() - 1))
@@ -49,18 +69,17 @@ bool SelectEngine::AddFd(EventHandler* eh, int)
        return true;
 }
 
-bool SelectEngine::DelFd(EventHandler* eh, bool force)
+void SelectEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
        if ((fd < 0) || (fd > GetMaxFds() - 1))
-               return false;
+               return;
 
        CurrentSetSize--;
        ref[fd] = NULL;
 
        ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-       return true;
 }
 
 void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -80,8 +99,8 @@ int SelectEngine::DispatchEvents()
        FD_ZERO(&rfdset);
        FD_ZERO(&errfdset);
 
-       /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue, IOCP) */
-       for (int i = 0; i < FD_SETSIZE; i++)
+       /* Populate the select FD sets (this is why select sucks compared to epoll, kqueue) */
+       for (unsigned int i = 0; i < FD_SETSIZE; i++)
        {
                EventHandler* eh = ref[i];
                if (!eh)
@@ -89,7 +108,7 @@ int SelectEngine::DispatchEvents()
                int state = eh->GetEventMask();
                if (state & (FD_WANT_POLL_READ | FD_WANT_FAST_READ))
                        FD_SET (i, &rfdset);
-               if (state & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE))
+               if (state & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE))
                        FD_SET (i, &wfdset);
                FD_SET (i, &errfdset);
        }
@@ -99,6 +118,7 @@ int SelectEngine::DispatchEvents()
        tval.tv_usec = 0;
 
        sresult = select(FD_SETSIZE, &rfdset, &wfdset, &errfdset, &tval);
+       ServerInstance->UpdateTime();
 
        /* Nothing to process this time around */
        if (sresult < 1)
@@ -128,13 +148,15 @@ int SelectEngine::DispatchEvents()
                                if (FD_ISSET (i, &rfdset))
                                {
                                        ReadEvents++;
-                                       SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
+                                       SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
                                        ev->HandleEvent(EVENT_READ);
+                                       if (ev != ref[i])
+                                               continue;
                                }
                                if (FD_ISSET (i, &wfdset))
                                {
                                        WriteEvents++;
-                                       SetEventMask(eh, eh->GetEventMask() & ~FD_WRITE_WILL_BLOCK);
+                                       SetEventMask(ev, ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
                                        ev->HandleEvent(EVENT_WRITE);
                                }
                        }
@@ -148,3 +170,8 @@ std::string SelectEngine::GetName()
 {
        return "select";
 }
+
+SocketEngine* CreateSocketEngine()
+{
+       return new SelectEngine;
+}