m_spanningtree Propagate topic changes via FTOPIC in order to prevent desync when...

[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 648ad3ac103007923b89e46cf38fad3e1db7be68..8a2fb87f409ced96fd8ffa7b178f2f5901cb14e5 100644 (file)
--- a/src/socketengines/socketengine_ports.cpp
+++ b/src/socketengines/socketengine_ports.cpp
@@ -32,10 +32,10 @@
 #include <vector>
 #include <string>
 #include <map>
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include "socketengine.h"
 #include <port.h>
+#include <iostream>
 
 /** A specialisation of the SocketEngine class, designed to use solaris 10 I/O completion ports
  */
@@ -45,20 +45,19 @@ private:
        /** These are used by epoll() to hold socket events
         */
        port_event_t* events;
+       int EngineHandle;
 public:
        /** Create a new PortsEngine
-        * @param Instance The creator of this object
         */
        PortsEngine();
        /** Delete a PortsEngine
         */
        virtual ~PortsEngine();
        virtual bool AddFd(EventHandler* eh, int event_mask);
-       void OnSetEvent(EventHandler* eh, int old_event, int new_event);
+       virtual void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
        virtual void DelFd(EventHandler* eh);
        virtual int DispatchEvents();
        virtual std::string GetName();
-       virtual void WantWrite(EventHandler* eh);
 };
 
 #endif
@@ -75,18 +74,18 @@ PortsEngine::PortsEngine()
        }
        else
        {
-               ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
-               printf("ERROR: Can't determine maximum number of open sockets!\n");
+               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->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        EngineHandle = port_create();
 
        if (EngineHandle == -1)
        {
-               ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno));
-               ServerInstance->Logs->Log("SOCKET",SPARSE,"ERROR: This is a fatal error, exiting now.");
-               printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno));
-               printf("ERROR: This is a fatal error, exiting now.\n");
+               ServerInstance->Logs->Log("SOCKET", LOG_SPARSE, "ERROR: Could not initialize socket engine: %s", strerror(errno));
+               ServerInstance->Logs->Log("SOCKET", LOG_SPARSE, "ERROR: This is a fatal error, exiting now.");
+               std::cout << "ERROR: Could not initialize socket engine: " << strerror(errno) << std::endl;
+               std::cout << "ERROR: This is a fatal error, exiting now." << std::endl;
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
@@ -126,12 +125,12 @@ bool PortsEngine::AddFd(EventHandler* eh, int event_mask)
        SocketEngine::SetEventMask(eh, event_mask);
        port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(event_mask), eh);
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
        CurrentSetSize++;
        return true;
 }
 
-void PortsEngine::WantWrite(EventHandler* eh, int old_mask, int new_mask)
+void PortsEngine::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);
@@ -148,8 +147,7 @@ void PortsEngine::DelFd(EventHandler* eh)
        CurrentSetSize--;
        ref[fd] = NULL;
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
-       return true;
+       ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "Remove file descriptor: %d", fd);
 }
 
 int PortsEngine::DispatchEvents()
@@ -160,15 +158,16 @@ int PortsEngine::DispatchEvents()
        poll_time.tv_nsec = 0;
 
        unsigned int nget = 1; // used to denote a retrieve request.
-       int i = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
+       int ret = port_getn(EngineHandle, this->events, GetMaxFds() - 1, &nget, &poll_time);
        ServerInstance->UpdateTime();
 
        // first handle an error condition
-       if (i == -1)
-               return i;
+       if (ret == -1)
+               return -1;
 
        TotalEvents += nget;
 
+       unsigned int i;
        for (i = 0; i < nget; i++)
        {
                switch (this->events[i].portev_source)
@@ -185,7 +184,7 @@ int PortsEngine::DispatchEvents()
                                        if (events[i].portev_events & POLLRDNORM)
                                                mask &= ~FD_READ_WILL_BLOCK;
                                        // reinsert port for next time around, pretending to be one-shot for writes
-                                       SetEventMask(ev, mask);
+                                       SetEventMask(eh, mask);
                                        port_associate(EngineHandle, PORT_SOURCE_FD, fd, mask_to_events(mask), eh);
                                        if (events[i].portev_events & POLLRDNORM)
                                        {
@@ -206,7 +205,7 @@ int PortsEngine::DispatchEvents()
                }
        }
 
-       return i;
+       return (int)i;
 }
 
 std::string PortsEngine::GetName()