* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * InspIRCd: (C) 2002-2010 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
*
* This program is free but copyrighted software; see
* the file COPYING for details.
#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-2010 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(InspIRCd* Instance) : SocketEngine(Instance)
+KQueueEngine::KQueueEngine()
{
+ MAX_DESCRIPTORS = 0;
this->RecoverFromFork();
ke_list = new struct kevent[GetMaxFds()];
ref = new EventHandler* [GetMaxFds()];
/*
* The only bad thing about kqueue is that its fd cant survive a fork and is not inherited.
* BUM HATS.
- *
+ *
*/
EngineHandle = kqueue();
if (EngineHandle == -1)
delete[] ke_list;
}
-bool KQueueEngine::AddFd(EventHandler* eh)
+bool KQueueEngine::AddFd(EventHandler* eh, int event_mask)
{
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
- if (GetRemainingFds() <= 1)
- return false;
-
if (ref[fd])
return false;
+ // We always want to read from the socket...
struct kevent ke;
- EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+ EV_SET(&ke, fd, EVFILT_READ, EV_ADD, 0, 0, NULL);
int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
if (i == -1)
{
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to add fd: %d %s",
+ fd, strerror(errno));
return false;
}
ref[fd] = eh;
+ SocketEngine::SetEventMask(eh, event_mask);
+ OnSetEvent(eh, 0, event_mask);
CurrentSetSize++;
ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
int fd = eh->GetFd();
if ((fd < 0) || (fd > GetMaxFds() - 1))
+ {
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"DelFd() on invalid fd: %d", fd);
return false;
+ }
struct kevent ke;
- EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
-
- int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+ // First remove the write filter ignoring errors, since we can't be
+ // sure if there are actually any write filters registered.
EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+ kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+ // Then remove the read filter.
+ EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL);
int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
- if ((j < 0) && (i < 0) && !force)
+ if ((j < 0) && !force)
+ {
+ 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);
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
return true;
}
-void KQueueEngine::WantWrite(EventHandler* eh)
+void KQueueEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask)
{
- /** 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, EV_ADD | EV_ONESHOT, 0, 0, NULL);
- kevent(EngineHandle, &ke, 1, 0, 0, NULL);
-}
-
-int KQueueEngine::GetMaxFds()
-{
- if (!MAX_DESCRIPTORS)
+ if ((new_mask & FD_WANT_POLL_WRITE) && !(old_mask & FD_WANT_POLL_WRITE))
{
- int mib[2], maxfiles;
- size_t len;
-
- mib[0] = CTL_KERN;
- mib[1] = KERN_MAXFILES;
- len = sizeof(maxfiles);
- sysctl(mib, 2, &maxfiles, &len, NULL, 0);
- MAX_DESCRIPTORS = maxfiles;
- return maxfiles;
+ // new poll-style write
+ struct kevent ke;
+ EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD, 0, 0, NULL);
+ int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+ if (i < 0) {
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s",
+ eh->GetFd(), strerror(errno));
+ }
+ }
+ else if ((old_mask & FD_WANT_POLL_WRITE) && !(new_mask & FD_WANT_POLL_WRITE))
+ {
+ // removing poll-style write
+ struct kevent ke;
+ EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL);
+ int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL);
+ if (i < 0) {
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s",
+ eh->GetFd(), strerror(errno));
+ }
+ }
+ 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;
+ 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 < 0) {
+ ServerInstance->Logs->Log("SOCKET",DEFAULT,"Failed to mark for writing: %d %s",
+ eh->GetFd(), strerror(errno));
+ }
}
- return MAX_DESCRIPTORS;
-}
-
-int KQueueEngine::GetRemainingFds()
-{
- return GetMaxFds() - CurrentSetSize;
}
int KQueueEngine::DispatchEvents()
for (int j = 0; j < i; j++)
{
+ EventHandler* eh = ref[ke_list[j].ident];
+ if (!eh)
+ continue;
if (ke_list[j].flags & EV_EOF)
{
- /* 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!
- */
ErrorEvents++;
- if (ref[ke_list[j].ident])
- ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
+ eh->HandleEvent(EVENT_ERROR, ke_list[j].fflags);
continue;
}
- if (ke_list[j].flags & EVFILT_WRITE)
+ if (ke_list[j].filter == EVFILT_WRITE)
{
- /* This looks wrong but its right. As above, theres no modify
- * call in kqueue. See the manpage.
- */
- if (ref[ke_list[j].ident]->Readable())
- {
- struct kevent ke;
- EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL);
- kevent(EngineHandle, &ke, 1, 0, 0, NULL);
- }
WriteEvents++;
- if (ref[ke_list[j].ident])
- ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE);
+ /* 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_SINGLE_WRITE | FD_WANT_FAST_WRITE | FD_WRITE_WILL_BLOCK;
+ SetEventMask(eh, eh->GetEventMask() & ~bits_to_clr);
+ eh->HandleEvent(EVENT_WRITE);
}
- else
+ if (ke_list[j].filter == EVFILT_READ)
{
ReadEvents++;
- if (ref[ke_list[j].ident])
- ref[ke_list[j].ident]->HandleEvent(EVENT_READ);
+ SetEventMask(eh, eh->GetEventMask() & ~FD_READ_WILL_BLOCK);
+ eh->HandleEvent(EVENT_READ);
}
}
{
return "kqueue";
}
+
+SocketEngine* CreateSocketEngine()
+{
+ return new KQueueEngine;
+}
projects / user / henk / code / inspircd.git / blobdiff