#include <sys/types.h>
#include <sys/event.h>
#include <sys/time.h>
-#include "socketengines/socketengine_kqueue.h"
+/* +------------------------------------+
+ * | Inspire Internet Relay Chat Daemon |
+ * +------------------------------------+
+ *
+ * InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
+ *
+ * This program is free but copyrighted software; see
+ * the file COPYING for details.
+ *
+ * ---------------------------------------------------
+ */
+
+#ifndef __SOCKETENGINE_KQUEUE__
+#define __SOCKETENGINE_KQUEUE__
+
+#include <vector>
+#include <string>
+#include <map>
+#include "inspircd_config.h"
+#include "inspircd.h"
+#include <sys/types.h>
+#include <sys/event.h>
+#include <sys/time.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();
+};
+
+#endif
+
#include <sys/sysctl.h>
KQueueEngine::KQueueEngine()
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);
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;
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);
}
{
return "kqueue";
}
+
+SocketEngine* CreateSocketEngine()
+{
+ return new KQueueEngine;
+}