Add new cross-module event system

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

diff --git a/src/socketengines/socketengine_kqueue.cpp b/src/socketengines/socketengine_kqueue.cpp
index 96def4cca81b828be325fd30512bba2d37c7ddf7..8cc8a33f9ffe346ed83e189683474d2e43990d13 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -24,7 +24,6 @@
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
-#include "socketengine.h"
 #include <iostream>
 #include <sys/sysctl.h>
 
@@ -58,13 +57,8 @@ void SocketEngine::Init()
        mib[1] = KERN_MAXFILES;
 #endif
        len = sizeof(MAX_DESCRIPTORS);
+       // MAX_DESCRIPTORS is mainly used for display purposes, no problem if the sysctl() below fails
        sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
-       if (MAX_DESCRIPTORS <= 0)
-       {
-               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);
-       }
 
        RecoverFromFork();
 }
@@ -105,7 +99,7 @@ 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))
@@ -113,7 +107,7 @@ bool SocketEngine::AddFd(EventHandler* eh, int event_mask)
 
        // We always want to read from the socket...
        struct kevent* ke = GetChangeKE();
-       EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
+       EV_SET(ke, fd, EVFILT_READ, EV_ADD, 0, 0, static_cast<void*>(eh));
 
        ServerInstance->Logs->Log("SOCKET", LOG_DEBUG, "New file descriptor: %d", fd);
 
@@ -128,7 +122,7 @@ void SocketEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
-       if ((fd < 0) || (fd > GetMaxFds() - 1))
+       if (fd < 0)
        {
                ServerInstance->Logs->Log("SOCKET", LOG_DEFAULT, "DelFd() on invalid fd: %d", fd);
                return;
@@ -154,7 +148,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        {
                // new poll-style write
                struct kevent* ke = GetChangeKE();
-               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, static_cast<void*>(eh));
        }
        else if ((old_mask & FD_WANT_POLL_WRITE) && !(new_mask & FD_WANT_POLL_WRITE))
        {
@@ -165,7 +159,7 @@ void SocketEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
        if ((new_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) && !(old_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)))
        {
                struct kevent* ke = GetChangeKE();
-               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
+               EV_SET(ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, static_cast<void*>(eh));
        }
 }
 
@@ -187,13 +181,14 @@ int SocketEngine::DispatchEvents()
        for (int j = 0; j < i; j++)
        {
                struct kevent& kev = ke_list[j];
+               EventHandler* eh = static_cast<EventHandler*>(kev.udata);
+               if (!eh)
+                       continue;
 
                // Copy these in case the vector gets resized and kev invalidated
-               const int fd = kev.ident;
+               const int fd = eh->GetFd();
                const short filter = kev.filter;
-
-               EventHandler* eh = GetRef(fd);
-               if (!eh)
+               if (fd < 0)
                        continue;
 
                if (kev.flags & EV_EOF)