2.0.5 release

[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 1a783153eae944ad333f0a9cdd4b656b92c22d11..c1aa0c6ee9f5f5acfc615b3cf40cc33f1a340ef8 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-2009 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2010 InspIRCd Development Team
  * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
@@ -16,12 +16,54 @@
 #include <sys/types.h>
 #include <sys/event.h>
 #include <sys/time.h>
-#include "socketengines/socketengine_kqueue.h"
+#include "socketengine.h"
+
+/** A specialisation of the SocketEngine class, designed to use FreeBSD kqueue().
+ */
+class KQueueEngine : public SocketEngine
+{
+private:
+       int EngineHandle;
+       /** These are used by kqueue() to hold socket events
+        */
+       struct kevent* ke_list;
+       /** This is a specialised time value used by kqueue()
+        */
+       struct timespec ts;
+public:
+       /** Create a new KQueueEngine
+        */
+       KQueueEngine();
+       /** Delete a KQueueEngine
+        */
+       virtual ~KQueueEngine();
+       bool AddFd(EventHandler* eh, int event_mask);
+       void OnSetEvent(EventHandler* eh, int old_mask, int new_mask);
+       virtual void DelFd(EventHandler* eh);
+       virtual int DispatchEvents();
+       virtual std::string GetName();
+       virtual void RecoverFromFork();
+};
+
 #include <sys/sysctl.h>
 
 KQueueEngine::KQueueEngine()
 {
        MAX_DESCRIPTORS = 0;
+       int mib[2];
+       size_t len;
+
+       mib[0] = CTL_KERN;
+       mib[1] = KERN_MAXFILESPERPROC;
+       len = sizeof(MAX_DESCRIPTORS);
+       sysctl(mib, 2, &MAX_DESCRIPTORS, &len, NULL, 0);
+       if (MAX_DESCRIPTORS <= 0)
+       {
+               ServerInstance->Logs->Log("SOCKET", DEFAULT, "ERROR: Can't determine maximum number of open sockets!");
+               printf("ERROR: Can't determine maximum number of open sockets!\n");
+               ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
+       }
+
        this->RecoverFromFork();
        ke_list = new struct kevent[GetMaxFds()];
        ref = new EventHandler* [GetMaxFds()];
@@ -76,27 +118,23 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
                return false;
        }
 
-       if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) {
-               // ...and sometimes want to write
-               WantWrite(eh);
-       }
-
        ref[fd] = eh;
        SocketEngine::SetEventMask(eh, event_mask);
+       OnSetEvent(eh, 0, event_mask);
        CurrentSetSize++;
 
        ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
        return true;
 }
 
-bool KQueueEngine::DelFd(EventHandler* eh, bool force)
+void KQueueEngine::DelFd(EventHandler* eh)
 {
        int fd = eh->GetFd();
 
        if ((fd < 0) || (fd > GetMaxFds() - 1))
        {
                ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd);
-               return false;
+               return;
        }
 
        struct kevent ke;
@@ -110,18 +148,16 @@ bool KQueueEngine::DelFd(EventHandler* eh, bool force)
        EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
        int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
 
-       if ((j < 0) && !force)
+       if (j < 0)
        {
                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);
-       return true;
 }
 
 void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
@@ -167,6 +203,7 @@ int KQueueEngine::DispatchEvents()
        ts.tv_sec = 1;
 
        int i = kevent(EngineHandle, NULL, 0, &ke_list[0], GetMaxFds(), &ts);
+       ServerInstance->UpdateTime();
 
        TotalEvents += i;
 
@@ -191,6 +228,10 @@ int KQueueEngine::DispatchEvents()
                        const int bits_to_clr = FD_WANT_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
                        SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
                        eh->HandleEvent(EVENT_WRITE);
+
+                       if (eh != ref[ke_list[j].ident])
+                               // whoops, deleted out from under us
+                               continue;
                }
                if (ke_list[j].filter == EVFILT_READ)
                {
@@ -207,3 +248,8 @@ std::string KQueueEngine::GetName()
 {
        return "kqueue";
 }
+
+SocketEngine* CreateSocketEngine()
+{
+       return new KQueueEngine;
+}