Jesus, look who's the commit whore today. More header updates, and removal of namespa...

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

diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp
index 59e4c4812f241b0e491e79c0459e900c666300aa..02cef0e44d494f9e04955159d567efcb5b8860bb 100644 (file)
--- a/src/socketengine_kqueue.cpp
+++ b/src/socketengine_kqueue.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -49,18 +46,18 @@ bool KQueueEngine::AddFd(EventHandler* eh)
 
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+               ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
        }
        if (GetRemainingFds() <= 1)
        {
-               ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
+               ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
                return false;
        }
 
        if (ref[fd])
        {
-               ServerInstance->Log(DEFAULT,"ERROR: Slot already occupied");
+               ServerInstance->Log(DEBUG,"ERROR: Slot already occupied");
                return false;
        }
 
@@ -92,14 +89,16 @@ bool KQueueEngine::DelFd(EventHandler* eh)
                return false;
 
        struct kevent ke;
-       EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+       EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
 
        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
-       if (i == -1)
-       {
-               ServerInstance->Log(DEBUG,"kqueue: Failed to remove socket from queue: %s",strerror(errno));
+       
+       EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+
+       int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+
+       if ((j < 0) && (i < 0))
                return false;
-       }
 
        CurrentSetSize--;
        ref[fd] = NULL;
@@ -109,17 +108,17 @@ bool KQueueEngine::DelFd(EventHandler* eh)
 
 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_SET(&ke, eh->GetFd(), EVFILT_WRITE | EVFILT_READ, EV_ADD | EV_ONESHOT, 0, 0, NULL);
+       EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
        if (i == -1)
        {
                ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d for wanting write", eh->GetFd());
        }
-       else
-       {
-               ServerInstance->Log(DEBUG,"kqueue: Set fd %d for want write", eh->GetFd());
-       }
 }
 
 int KQueueEngine::GetMaxFds()
@@ -140,9 +139,23 @@ int KQueueEngine::DispatchEvents()
        for (int j = 0; j < i; j++)
        {
                ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ke_list[j].flags & EVFILT_WRITE ? "write" : "read", ke_list[j].ident);
+               if (ke_list[j].flags & EV_EOF)
+               {
+                       ServerInstance->Log(DEBUG,"kqueue: Error on FD %d", ke_list[j].ident);
+                       /* We love you kqueue, oh yes we do *sings*!
+                        * kqueue gives us the error number directly in the EOF state!
+                        * Unlike smelly epoll and select, where we have to getsockopt
+                        * to get the error, this saves us time and cpu cycles. Go BSD!
+                        */
+                       if (ref[ke_list[j].ident])
+                               ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
+                       continue;
+               }
                if (ke_list[j].flags & EVFILT_WRITE)
                {
-                       ServerInstance->Log(DEBUG,"kqueue: Write socket wants to be set back to read");
+                       /* 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);
                        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
@@ -150,8 +163,14 @@ int KQueueEngine::DispatchEvents()
                        {
                                ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d back to just wanting to read!", ke_list[j].ident);
                        }
+                       if (ref[ke_list[j].ident])
+                               ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
+               }
+               else
+               {
+                       if (ref[ke_list[j].ident])
+                               ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
                }
-               ref[ke_list[j].ident]->HandleEvent(ke_list[j].flags & EVFILT_WRITE ? EVENT_WRITE : EVENT_READ);
        }
 
        return i;