Merge insp20

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

diff --git a/src/socketengines/socketengine_ports.cpp b/src/socketengines/socketengine_ports.cpp
index e1fcc0e6cd2dedb4d20494294c3789c5bcf05c67..d94d02664f1b5597d0c2b4b89c9e0f47643054b0 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -25,50 +25,28 @@
 # error You need Solaris 10 or later to make use of this code.
 #endif
 
-#include <vector>
-#include <string>
-#include <map>
 #include "inspircd.h"
-#include "socketengine.h"
 #include <port.h>
 #include <iostream>
 #include <ulimit.h>
 
 /** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
  */
-class PortsEngine : public SocketEngine
+namespace
 {
-private:
        /** These are used by ports to hold socket events
         */
-       std::vector<port_event_t> events;
+       std::vector<port_event_t> events(16);
        int EngineHandle;
-public:
-       /** Create a new PortsEngine
-        */
-       PortsEngine();
-       /** Delete a PortsEngine
-        */
-       virtual ~PortsEngine();
-       virtual bool AddFd(EventHandler* eh, int event_mask);
-       virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
-       virtual void DelFd(EventHandler* eh);
-       virtual int DispatchEvents();
-};
-
-PortsEngine::PortsEngine() : events(1)
+}
+
+/** Initialize ports engine
+ */
+void SocketEngine::Init()
 {
-       int max = ulimit(4, 0);
-       if (max > 0)
-       {
-               MAX_DESCRIPTORS = max;
-       }
-       else
-       {
-               ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
-               std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl;
-               ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
-       }
+       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if ulimit() fails and returns a negative number
+       MAX_DESCRIPTORS = ulimit(4, 0);
+
        EngineHandle = port_create();
 
        if (EngineHandle == -1)
@@ -81,9 +59,15 @@ PortsEngine::PortsEngine() : events(1)
        }
 }
 
-PortsEngine::~PortsEngine()
+/** Shutdown the ports engine
+ */
+void SocketEngine::Deinit()
+{
+       SocketEngine::Close(EngineHandle);
+}
+
+void SocketEngine::RecoverFromFork()
 {
-       this->Close(EngineHandle);
 }
 
 static int mask_to_events(int event_mask)
@@ -96,16 +80,16 @@ static int mask_to_events(int event_mask)
        return rv;
 }
 
-bool PortsEngine::AddFd(EventHandler* eh, int event_mask)
+bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       if (fd < 0)
                return false;
 
        if (!SocketEngine::AddFdRef(eh))
                return false;
 
-       SocketEngine::SetEventMask(eh, event_mask);
+       eh->SetEventMask(event_mask);
        port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh);
 
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
@@ -114,16 +98,16 @@ bool PortsEngine::AddFd(EventHandler* eh, int event_mask)
        return true;
 }
 
-void PortsEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
+void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
 {
        if (mask_to_events(new_mask) != mask_to_events(old_mask))
                port_associate(EngineHandle, PORT_SOURCE_FD, eh->GetFd(), mask_to_events(new_mask), eh);
 }
 
-void PortsEngine::DelFd(EventHandler* eh)
+void SocketEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       if (fd < 0)
                return;
 
        port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
@@ -133,7 +117,7 @@ void PortsEngine::DelFd(EventHandler* eh)
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
 }
 
-int PortsEngine::DispatchEvents()
+int SocketEngine::DispatchEvents()
 {
        struct timespec poll_time;
 
@@ -161,8 +145,8 @@ int PortsEngine::DispatchEvents()
                // Copy these in case the vector gets resized and ev invalidated
                const int fd = ev.portev_object;
                const int portev_events = ev.portev_events;
-               EventHandler* eh = GetRef(fd);
-               if (!eh)
+               EventHandler* eh = static_cast<EventHandler*>(ev.portev_user);
+               if (eh->GetFd() < 0)
                        continue;
 
                int mask = eh->GetEventMask();
@@ -171,26 +155,21 @@ int PortsEngine::DispatchEvents()
                if (portev_events & POLLRDNORM)
                        mask &= ~FD_READ_WILL_BLOCK;
                // reinsert port for next time around, pretending to be one-shot for writes
-               SetEventMask(eh, mask);
+               eh->SetEventMask(mask);
                port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
                if (portev_events & POLLRDNORM)
                {
                        stats.ReadEvents++;
-                       eh->HandleEvent(EVENT_READ);
+                       eh->OnEventHandlerRead();
                        if (eh != GetRef(fd))
                                continue;
                }
                if (portev_events & POLLWRNORM)
                {
                        stats.WriteEvents++;
-                       eh->HandleEvent(EVENT_WRITE);
+                       eh->OnEventHandlerWrite();
                }
        }
 
        return (int)i;
 }
-
-SocketEngine* CreateSocketEngine()
-{
-       return new PortsEngine;
-}