* | Inspire Internet Relay Chat Daemon |
* +------------------------------------+
*
- * InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ * 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.
+ * the file COPYING for details.
*
* ---------------------------------------------------
*/
#include <sys/event.h>
#include <sys/time.h>
#include "socketengines/socketengine_kqueue.h"
+#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()];
+ memset(ref, 0, GetMaxFds() * sizeof(EventHandler*));
}
void KQueueEngine::RecoverFromFork()
/*
* 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)
{
- ServerInstance->Log(DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
- ServerInstance->Log(DEFAULT, "ERROR: this is a fatal error, exiting now.");
+ ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
+ ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: this is a fatal error, exiting now.");
printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.\n");
printf("ERROR: this is a fatal error, exiting now.\n");
ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE);
KQueueEngine::~KQueueEngine()
{
this->Close(EngineHandle);
+ delete[] ref;
+ delete[] ke_list;
}
-bool KQueueEngine::AddFd(EventHandler* eh)
+bool KQueueEngine::AddFd(EventHandler* eh, bool writeFirst)
{
int fd = eh->GetFd();
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ if ((fd < 0) || (fd > GetMaxFds() - 1))
return false;
if (GetRemainingFds() <= 1)
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;
}
+ if (writeFirst) {
+ // ...and sometimes want to write
+ WantWrite(eh);
+ }
+
ref[fd] = eh;
CurrentSetSize++;
- ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
return true;
}
{
int fd = eh->GetFd();
- if ((fd < 0) || (fd > MAX_DESCRIPTORS))
+ 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->Log(DEBUG,"Remove file descriptor: %d", fd);
+ ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
return true;
}
void KQueueEngine::WantWrite(EventHandler* eh)
{
- /** 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_ONESHOT since we only ever want one write event
EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_ADD | EV_ONESHOT, 0, 0, NULL);
- kevent(EngineHandle, &ke, 1, 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));
+ }
}
int KQueueEngine::GetMaxFds()
{
+ if (!MAX_DESCRIPTORS)
+ {
+ 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;
+ }
return MAX_DESCRIPTORS;
}
int KQueueEngine::GetRemainingFds()
{
- return MAX_DESCRIPTORS - CurrentSetSize;
+ return GetMaxFds() - CurrentSetSize;
}
int KQueueEngine::DispatchEvents()
ts.tv_nsec = 0;
ts.tv_sec = 1;
- int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts);
+ int i = kevent(EngineHandle, NULL, 0, &ke_list[0], GetMaxFds(), &ts);
TotalEvents += i;
ref[ke_list[j].ident]->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.
+ /* We only ever add write events with EV_ONESHOT, which
+ * means they are automatically removed once such a
+ * event fires, so nothing to do here.
*/
- 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);
}
- else
+ if (ke_list[j].filter == EVFILT_READ)
{
ReadEvents++;
if (ref[ke_list[j].ident])
projects / user / henk / code / inspircd.git / blobdiff