Include explicit parameter list in ProtocolInterface::SendMode

[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 214afc71c42ac96f16ac8c2e3412bf6eeededc9a..76ef3851e4b007cb18cbabc78a8f3a1c6e8bc8ea 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,6 +21,7 @@
 
 KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
+       MAX_DESCRIPTORS = 0;
        this->RecoverFromFork();
        ke_list = new struct kevent[GetMaxFds()];
        ref = new EventHandler* [GetMaxFds()];
@@ -32,7 +33,7 @@ void KQueueEngine::RecoverFromFork()
        /*
         * The only bad thing about kqueue is that its fd cant survive a fork and is not inherited.
         * BUM HATS.
-        * 
+        *
         */
        EngineHandle = kqueue();
        if (EngineHandle == -1)
@@ -66,15 +67,23 @@ bool KQueueEngine::AddFd(EventHandler* eh)
        if (ref[fd])
                return false;
 
+       // We always want to read from the socket...
        struct kevent ke;
-       EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+       EV_SET(&ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
 
        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
        if (i == -1)
        {
+               ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to add fd: %d %s",
+                                         fd, strerror(errno));
                return false;
        }
 
+       if (!eh->Readable()) {
+               // ...and sometimes want to write
+               WantWrite(eh);
+       }
+
        ref[fd] = eh;
        CurrentSetSize++;
 
@@ -87,36 +96,46 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
        int fd = eh->GetFd();
 
        if ((fd < 0) || (fd > GetMaxFds() - 1))
+       {
+               ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd);
                return false;
+       }
 
        struct kevent ke;
-       EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
-
-       int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
+       // First remove the write filter ignoring errors, since we can't be
+       // sure if there are actually any write filters registered.
        EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+       kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
+       // Then remove the read filter.
+       EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
        int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
-       if ((j < 0) && (i < 0) && !force)
+       if ((j < 0) && !force)
+       {
+               ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to remove fd: %d %s",
+                                         fd, strerror(errno));
                return false;
+       }
 
        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;
 }
 
 void KQueueEngine::WantWrite(EventHandler* eh)
 {
-       /** When changing an item in a kqueue, there is no 'modify' call
-        * as in epoll. Instead, we add the item again, and this overwrites
-        * the original setting rather than adding it twice. See man kqueue.
-        */
        struct kevent ke;
+       // EV_ONESHOT since we only ever want one write event
        EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
-       kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+       int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+       if (i < 0) {
+               ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s",
+                                         eh->GetFd(), strerror(errno));
+       }
 }
 
 int KQueueEngine::GetMaxFds()
@@ -124,7 +143,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,22 +183,18 @@ 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.
+                       /* We only ever add write events with EV_ONESHOT, which
+                        * means they are automatically removed once such a
+                        * event fires, so nothing to do here.
                         */
-                       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])