Add Ankit to regular contributors list

[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 5fabb5b8de62be950c465e2888f2dccd767b3c98..81ef4be1d4ce4deb2058458ce97979988626bdbb 100644 (file)
--- a/src/socketengines/socketengine_kqueue.cpp
+++ b/src/socketengines/socketengine_kqueue.cpp
@@ -2,7 +2,7 @@
  *       | 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
@@ -21,9 +21,11 @@
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+       MAX_DESCRIPTORS = 0;
        this->RecoverFromFork();
-       ref = new EventHandler* [GetMaxFds()];
        ke_list = new struct kevent[GetMaxFds()];
+       ref = new EventHandler* [GetMaxFds()];
+       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 void KQueueEngine::RecoverFromFork()
@@ -43,7 +45,6 @@ void KQueueEngine::RecoverFromFork()
                ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
        }
        CurrentSetSize = 0;
-       memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
 }
 
 KQueueEngine::~KQueueEngine()
@@ -104,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;
 }
 
@@ -115,6 +116,7 @@ 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);
 }
@@ -124,7 +126,7 @@ int KQueueEngine::GetMaxFds()
        if (!MAX_DESCRIPTORS)
        {
                int mib[2], maxfiles;
-               size_t len;
+               size_t len;
 
                mib[0] = CTL_KERN;
                mib[1] = KERN_MAXFILES;
@@ -164,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])