Dump sendq before closing socket

[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 c9734e85d192d6cb072ccab996cedb20c804258c..63a877238cf77ad7b88b11b2a741f4fdf0a30eb8 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 bool DelFd(EventHandler* eh, bool force = false);
+       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_MAXFILES;
+       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,13 +118,9 @@ bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
                return false;
        }
 
-       if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_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);
@@ -148,7 +186,7 @@ void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
                                                  eh->GetFd(), strerror(errno));
                }
        }
-       if ((new_mask & FD_WANT_EDGE_WRITE) && !(old_mask & FD_WANT_EDGE_WRITE))
+       if ((new_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) && !(old_mask & (FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)))
        {
                // new one-shot write
                struct kevent ke;
@@ -167,6 +205,7 @@ int KQueueEngine::DispatchEvents()
        ts.tv_sec = 1;
 
        int i = kevent(EngineHandle, NULL, 0, &ke_list[0], GetMaxFds(), &ts);
+       ServerInstance->UpdateTime();
 
        TotalEvents += i;
 
@@ -184,11 +223,11 @@ int KQueueEngine::DispatchEvents()
                if (ke_list[j].filter == EVFILT_WRITE)
                {
                        WriteEvents++;
-                       /* When mask is FD_WANT_FAST_WRITE, we set a one-shot
-                        * write, so we need to clear that bit to detect when it
-                        * set again.
+                       /* When mask is FD_WANT_FAST_WRITE or FD_WANT_SINGLE_WRITE,
+                        * we set a one-shot write, so we need to clear that bit
+                        * to detect when it set again.
                         */
-                       const int bits_to_clr = FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+                       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);
                }
@@ -207,3 +246,8 @@ std::string KQueueEngine::GetName()
 {
        return "kqueue";
 }
+
+SocketEngine* CreateSocketEngine()
+{
+       return new KQueueEngine;
+}