Missed one, thx peavey!

[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 f245830de93818f3c6f7aa0fba010eb3e85db1ea..81ef4be1d4ce4deb2058458ce97979988626bdbb 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -2,11 +2,11 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
- *            the file COPYING for details.
+ *         the file COPYING for details.
  *
  * ---------------------------------------------------
  */
@@ -17,11 +17,15 @@
 #include <sys/event.h>
 #include <sys/time.h>
 #include "socketengines/socketengine_kqueue.h"
-
+#include <sys/sysctl.h>
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+       MAX_DESCRIPTORS = 0;
        this->RecoverFromFork();
+       ke_list = new struct kevent[GetMaxFds()];
+       ref = new EventHandler* [GetMaxFds()];
+       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 void KQueueEngine::RecoverFromFork()
@@ -46,13 +50,15 @@ void KQueueEngine::RecoverFromFork()
 KQueueEngine::~KQueueEngine()
 {
        this->Close(EngineHandle);
+       delete[] ref;
+       delete[] ke_list;
 }
 
 bool KQueueEngine::AddFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       if ((fd < 0) || (fd > GetMaxFds() - 1))
                return false;
 
        if (GetRemainingFds() <= 1)
@@ -81,7 +87,7 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
 {
        int fd = eh->GetFd();
 
-       if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+       if ((fd < 0) || (fd > GetMaxFds() - 1))
                return false;
 
        struct kevent ke;
@@ -99,7 +105,7 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
        CurrentSetSize--;
        ref[fd] = NULL;
 
-       ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
+       //ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }
 
@@ -110,18 +116,31 @@ void KQueueEngine::WantWrite(EventHandler* eh)
         * the original setting rather than adding it twice. See man kqueue.
         */
        struct kevent ke;
+       EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, NULL);
        EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
        kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 }
 
 int KQueueEngine::GetMaxFds()
 {
+       if (!MAX_DESCRIPTORS)
+       {
+               int mib[2], maxfiles;
+               size_t len;
+
+               mib[0] = CTL_KERN;
+               mib[1] = KERN_MAXFILES;
+               len = sizeof(maxfiles);
+               sysctl(mib, 2, &maxfiles, &len, NULL, 0);
+               MAX_DESCRIPTORS = maxfiles;
+               return maxfiles;
+       }
        return MAX_DESCRIPTORS;
 }
 
 int KQueueEngine::GetRemainingFds()
 {
-       return MAX_DESCRIPTORS - CurrentSetSize;
+       return GetMaxFds() - CurrentSetSize;
 }
 
 int KQueueEngine::DispatchEvents()
@@ -129,7 +148,7 @@ int KQueueEngine::DispatchEvents()
        ts.tv_nsec = 0;
        ts.tv_sec = 1;
 
-       int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
+       int i = kevent(EngineHandle, NULL, 0, &ke_list[0], GetMaxFds(), &ts);
 
        TotalEvents += i;
 
@@ -147,19 +166,22 @@ int KQueueEngine::DispatchEvents()
                                ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
                        continue;
                }
-               if (ke_list[j].flags & EVFILT_WRITE)
+               if (ke_list[j].filter == EVFILT_WRITE)
                {
                        /* This looks wrong but its right. As above, theres no modify
                         * call in kqueue. See the manpage.
                         */
-                       struct kevent ke;
-                       EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
-                       kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+                       if (ref[ke_list[j].ident]->Readable())
+                       {
+                               struct kevent ke;
+                               EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
+                               kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+                       }
                        WriteEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
                }
-               else
+               if (ke_list[j].filter == EVFILT_READ)
                {
                        ReadEvents++;
                        if (ref[ke_list[j].ident])