These socket engines may now recieve write and read events in the same cycle, same...

[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 18a2261eff7a0f14370b0850e925061660b79eea..c7d8d74b9e493c3ea938559ee8d92712e40fa32f 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-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 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()
@@ -34,10 +38,10 @@ void KQueueEngine::RecoverFromFork()
        EngineHandle = kqueue();
        if (EngineHandle == -1)
        {
-               ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now.");
-               printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               printf("ERROR: this is a fatal error, exiting now.");
+               ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+               ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: this is a fatal error, exiting now.");
+               printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n");
+               printf("ERROR: this is a fatal error, exiting now.\n");
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
@@ -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)
@@ -73,7 +79,7 @@ bool KQueueEngine::AddFd(EventHandler* eh)
        ref[fd] = eh;
        CurrentSetSize++;
 
-       ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
        return true;
 }
 
@@ -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->Log(DEBUG,"Remove file descriptor: %d", fd);
+       //ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }
 
@@ -110,25 +116,41 @@ 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_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
+       EV_SET(&ke, eh->GetFd(), EVFILT_READ | 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()
 {
        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;
+
        for (int j = 0; j < i; j++)
        {
                if (ke_list[j].flags & EV_EOF)
@@ -138,6 +160,7 @@ int KQueueEngine::DispatchEvents()
                         * Unlike smelly epoll and select, where we have to getsockopt
                         * to get the error, this saves us time and cpu cycles. Go BSD!
                         */
+                       ErrorEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
                        continue;
@@ -147,14 +170,19 @@ int KQueueEngine::DispatchEvents()
                        /* 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
                {
+                       ReadEvents++;
                        if (ref[ke_list[j].ident])
                                ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
                }