Release v3.0.0 alpha 8.

[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 82fe0bb6b0ce874d9f953f7a247fbba3b8d62554..03f0aca62a04de54ab73137d0439dccc0f88888a 100644 (file)
--- a/src/socketengines/socketengine_select.cpp
+++ b/src/socketengines/socketengine_select.cpp
@@ -20,7 +20,6 @@
 
 
 #include "inspircd.h"
-#include "socketengine.h"
 
 #ifndef _WIN32
 #include <sys/select.h>
@@ -28,63 +27,63 @@
 
 /** A specialisation of the SocketEngine class, designed to use traditional select().
  */
-class SelectEngine : public SocketEngine
+namespace
 {
        fd_set ReadSet, WriteSet, ErrSet;
-       int MaxFD;
-
-public:
-       /** Create a new SelectEngine
-        */
-       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()
+       int MaxFD = 0;
+}
+
+void SocketEngine::Init()
 {
-       MAX_DESCRIPTORS = FD_SETSIZE;
-       CurrentSetSize = 0;
+       MaxSetSize = FD_SETSIZE;
 
        FD_ZERO(&ReadSet);
        FD_ZERO(&WriteSet);
        FD_ZERO(&ErrSet);
-       MaxFD = 0;
 }
 
-bool SelectEngine::AddFd(EventHandler* eh, int event_mask)
+void SocketEngine::Deinit()
+{
+}
+
+void SocketEngine::RecoverFromFork()
+{
+}
+
+bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+
+       if (fd < 0)
+               return false;
+
+       if (static_cast<size_t>(fd) >= GetMaxFds())
                return false;
 
-       if (!SocketEngine::AddFd(eh))
+       if (!SocketEngine::AddFdRef(eh))
                return false;
 
-       SocketEngine::SetEventMask(eh, event_mask);
+       eh->SetEventMask(event_mask);
        OnSetEvent(eh, 0, event_mask);
        FD_SET(fd, &ErrSet);
        if (fd > MaxFD)
                MaxFD = fd;
 
-       CurrentSetSize++;
-
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
        return true;
 }
 
-void SelectEngine::DelFd(EventHandler* eh)
+void SocketEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       if (fd < 0)
                return;
 
-       CurrentSetSize--;
-       SocketEngine::DelFd(eh);
+       if (static_cast<size_t>(fd) >= GetMaxFds())
+               return;
+
+       SocketEngine::DelFdRef(eh);
 
        FD_CLR(fd, &ReadSet);
        FD_CLR(fd, &WriteSet);
@@ -95,7 +94,7 @@ void SelectEngine::DelFd(EventHandler* eh)
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
 }
 
-void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
+void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 {
        int fd = eh->GetFd();
        int diff = old_mask ^ new_mask;
@@ -116,9 +115,11 @@ void SelectEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        }
 }
 
-int SelectEngine::DispatchEvents()
+int SocketEngine::DispatchEvents()
 {
-       static timeval tval = { 1, 0 };
+       timeval tval;
+       tval.tv_sec = 1;
+       tval.tv_usec = 0;
 
        fd_set rfdset = ReadSet, wfdset = WriteSet, errfdset = ErrSet;
 
@@ -140,45 +141,33 @@ int SelectEngine::DispatchEvents()
 
                if (has_error)
                {
-                       ErrorEvents++;
+                       stats.ErrorEvents++;
 
                        socklen_t codesize = sizeof(int);
                        int errcode = 0;
                        if (getsockopt(i, SOL_SOCKET, SO_ERROR, (char*)&errcode, &codesize) < 0)
                                errcode = errno;
 
-                       ev->HandleEvent(EVENT_ERROR, errcode);
+                       ev->OnEventHandlerError(errcode);
                        continue;
                }
 
                if (has_read)
                {
-                       ReadEvents++;
-                       SetEventMask(ev, ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
-                       ev->HandleEvent(EVENT_READ);
+                       ev->SetEventMask(ev->GetEventMask() & ~FD_READ_WILL_BLOCK);
+                       ev->OnEventHandlerRead();
                        if (ev != GetRef(i))
                                continue;
                }
 
                if (has_write)
                {
-                       WriteEvents++;
                        int newmask = (ev->GetEventMask() & ~(FD_WRITE_WILL_BLOCK | FD_WANT_SINGLE_WRITE));
-                       this->OnSetEvent(ev, ev->GetEventMask(), newmask);
-                       SetEventMask(ev, newmask);
-                       ev->HandleEvent(EVENT_WRITE);
+                       SocketEngine::OnSetEvent(ev, ev->GetEventMask(), newmask);
+                       ev->SetEventMask(newmask);
+                       ev->OnEventHandlerWrite();
                }
        }
 
        return sresult;
 }
-
-std::string SelectEngine::GetName()
-{
-       return "select";
-}
-
-SocketEngine* CreateSocketEngine()
-{
-       return new SelectEngine;
-}