X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_kqueue.cpp;h=50f6242e2914de027b92d613e5c2fd2ec970e54e;hb=9422f4157ccff0482cd70105ada3bd9325455eaa;hp=9a63c972fc2fdd67fba91c883d6bee51bd412f80;hpb=f4a1bfe7c060f633de970287ff5e49dcc57f5a9a;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine_kqueue.cpp b/src/socketengine_kqueue.cpp index 9a63c972f..50f6242e2 100644 --- a/src/socketengine_kqueue.cpp +++ b/src/socketengine_kqueue.cpp @@ -2,12 +2,9 @@ * | Inspire Internet Relay Chat Daemon | * +------------------------------------+ * - * InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev. - * E-mail: - * - * + * InspIRCd: (C) 2002-2007 InspIRCd Development Team + * See: http://www.inspircd.org/wiki/index.php/Credits * - * Written by Craig Edwards, Craig McLure, and others. * This program is free but copyrighted software; see * the file COPYING for details. * @@ -15,6 +12,7 @@ */ #include "inspircd.h" +#include "exitcodes.h" #include #include #include @@ -23,6 +21,16 @@ KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance) { + this->RecoverFromFork(); +} + +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) { @@ -30,64 +38,49 @@ KQueueEngine::KQueueEngine(InspIRCd* Instance) : SocketEngine(Instance) ServerInstance->Log(SPARSE,"ERROR: this is a fatal error, exiting now."); printf("ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features."); printf("ERROR: this is a fatal error, exiting now."); - InspIRCd::Exit(ERROR); + ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); } CurrentSetSize = 0; } KQueueEngine::~KQueueEngine() { - ServerInstance->Log(DEBUG,"KQueueEngine::~KQueueEngine()"); - close(EngineHandle); + this->Close(EngineHandle); } bool KQueueEngine::AddFd(EventHandler* eh) { int fd = eh->GetFd(); - ServerInstance->Log(DEBUG,"KQueueEngine::AddFd(%d)",fd); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) - { - ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS); return false; - } + if (GetRemainingFds() <= 1) - { - ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!"); return false; - } if (ref[fd]) - { - ServerInstance->Log(DEFAULT,"ERROR: Slot already occupied"); return false; - } - - ref[fd] = eh; - ServerInstance->Log(DEBUG,"Add socket %d",fd); struct kevent ke; - ServerInstance->Log(DEBUG,"kqueue: Add socket to events, kq=%d socket=%d",EngineHandle,fd); EV_SET(&ke, fd, eh->Readable() ? EVFILT_READ : EVFILT_WRITE, EV_ADD, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); if (i == -1) { - ServerInstance->Log(DEBUG,"kqueue: List insertion failure!"); return false; } + ref[fd] = eh; CurrentSetSize++; + + ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); return true; } -bool KQueueEngine::DelFd(EventHandler* eh) +bool KQueueEngine::DelFd(EventHandler* eh, bool force) { int fd = eh->GetFd(); - ServerInstance->Log(DEBUG,"KQueueEngine::DelFd(%d)",fd); - if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; @@ -95,17 +88,18 @@ bool KQueueEngine::DelFd(EventHandler* eh) EV_SET(&ke, eh->GetFd(), EVFILT_READ, EV_DELETE, 0, 0, NULL); int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - + EV_SET(&ke, eh->GetFd(), EVFILT_WRITE, EV_DELETE, 0, 0, NULL); int j = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if ((j < 0) && (i < 0)) + if ((j < 0) && (i < 0) && !force) return false; CurrentSetSize--; ref[fd] = NULL; + ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); return true; } @@ -117,11 +111,7 @@ void KQueueEngine::WantWrite(EventHandler* eh) */ 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 == -1) - { - ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d for wanting write", eh->GetFd()); - } + kevent(EngineHandle, &ke, 1, 0, 0, NULL); } int KQueueEngine::GetMaxFds() @@ -136,26 +126,37 @@ int KQueueEngine::GetRemainingFds() int KQueueEngine::DispatchEvents() { - ts.tv_nsec = 5000L; - ts.tv_sec = 0; + ts.tv_nsec = 0; + ts.tv_sec = 1; int i = kevent(EngineHandle, NULL, 0, &ke_list[0], MAX_DESCRIPTORS, &ts); for (int j = 0; j < i; j++) { - ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ke_list[j].flags & EVFILT_WRITE ? "write" : "read", ke_list[j].ident); + 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! + */ + if (ref[ke_list[j].ident]) + ref[ke_list[j].ident]->HandleEvent(EVENT_ERROR, ke_list[j].fflags); + continue; + } if (ke_list[j].flags & EVFILT_WRITE) { + /* This looks wrong but its right. As above, theres no modify + * call in kqueue. See the manpage. + */ struct kevent ke; EV_SET(&ke, ke_list[j].ident, EVFILT_READ, EV_ADD, 0, 0, NULL); - int i = kevent(EngineHandle, &ke, 1, 0, 0, NULL); - if (i == -1) - { - ServerInstance->Log(DEBUG,"kqueue: Unable to set fd %d back to just wanting to read!", ke_list[j].ident); - } - ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE); + kevent(EngineHandle, &ke, 1, 0, 0, NULL); + if (ref[ke_list[j].ident]) + ref[ke_list[j].ident]->HandleEvent(EVENT_WRITE); } else { - ref[ke_list[j].ident]->HandleEvent(EVENT_READ); + if (ref[ke_list[j].ident]) + ref[ke_list[j].ident]->HandleEvent(EVENT_READ); } }