Whoops, make /stats s work

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

diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp
index 9a63c972fc2fdd67fba91c883d6bee51bd412f80..b3605b82b82030a3167e0ddb57fc777fd7ece7ba 100644 (file)
--- a/src/socketengine_kqueue.cpp
+++ b/src/socketengine_kqueue.cpp
@@ -142,8 +142,22 @@ 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!
+                        */
+                       ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
+                       continue;
+               }
                if (ke_list[j].flags & 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);
                        int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
@@ -151,11 +165,13 @@ int KQueueEngine::DispatchEvents()
                        {
                                ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d back to just wanting to read!", ke_list[j].ident);
                        }
-                       ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
+                       if (ref[ke_list[j].ident])
+                               ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
                }
                else
                {
-                       ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
+                       if (ref[ke_list[j].ident])
+                               ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
                }
        }