cmd_quit Display quit messages of remote users

[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 098e7511662ecc343751516ee404f7f9007b5a18..c304001075d3ad02443aa587cb6bf3f17e5d4680 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -36,28 +36,17 @@
 
 /** 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();
-       virtual std::string GetName();
-};
-
-PortsEngine::PortsEngine() : events(1)
+}
+
+/** Initialize ports engine
+ */
+void SocketEngine::Init()
 {
        int max = ulimit(4, 0);
        if (max > 0)
@@ -80,12 +69,17 @@ PortsEngine::PortsEngine() : events(1)
                std::cout << "ERROR: This is a fatal error, exiting now." << std::endl;
                ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE);
        }
-       CurrentSetSize = 0;
 }
 
-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)
@@ -98,32 +92,31 @@ 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))
                return false;
 
-       if (!SocketEngine::AddFd(eh))
+       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);
-       CurrentSetSize++;
        ResizeDouble(events);
 
        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))
@@ -131,13 +124,12 @@ void PortsEngine::DelFd(EventHandler* eh)
 
        port_dissociate(EngineHandle, PORT_SOURCE_FD, fd);
 
-       CurrentSetSize--;
-       SocketEngine::DelFd(eh);
+       SocketEngine::DelFdRef(eh);
 
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
 }
 
-int PortsEngine::DispatchEvents()
+int SocketEngine::DispatchEvents()
 {
        struct timespec poll_time;
 
@@ -152,7 +144,7 @@ int PortsEngine::DispatchEvents()
        if (ret == -1)
                return -1;
 
-       TotalEvents += nget;
+       stats.TotalEvents += nget;
 
        unsigned int i;
        for (i = 0; i < nget; i++)
@@ -165,8 +157,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();
@@ -175,31 +167,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)
                {
-                       ReadEvents++;
+                       stats.ReadEvents++;
                        eh->HandleEvent(EVENT_READ);
                        if (eh != GetRef(fd))
                                continue;
                }
                if (portev_events & POLLWRNORM)
                {
-                       WriteEvents++;
+                       stats.WriteEvents++;
                        eh->HandleEvent(EVENT_WRITE);
                }
        }
 
        return (int)i;
 }
-
-std::string PortsEngine::GetName()
-{
-       return "ports";
-}
-
-SocketEngine* CreateSocketEngine()
-{
-       return new PortsEngine;
-}