X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_epoll.cpp;h=c1b22ffbad12ce87d56df31855509e05cb9a9ccd;hb=9c9386d71e1b317fa39cc251eb6450e14ec5929f;hp=6028ce2e1297d68f3cf145ae3176630e4cf6ff47;hpb=19bcd43f256258b90c1788e899ea5fe0dc044b4b;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 6028ce2e1..c1b22ffba 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -2,8 +2,8 @@ * | 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. @@ -11,26 +11,64 @@ * --------------------------------------------------- */ +#include +#include +#include #include "inspircd.h" #include "exitcodes.h" +#include "socketengine.h" #include -#include "socketengines/socketengine_epoll.h" #include +#define EP_DELAY 5 -EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance) +/** A specialisation of the SocketEngine class, designed to use linux 2.6 epoll(). + */ +class EPollEngine : public SocketEngine +{ +private: + /** These are used by epoll() to hold socket events + */ + struct epoll_event* events; + int EngineHandle; +public: + /** Create a new EPollEngine + */ + EPollEngine(); + /** Delete an EPollEngine + */ + virtual ~EPollEngine(); + virtual bool AddFd(EventHandler* eh, int event_mask); + virtual 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(); +}; + +EPollEngine::EPollEngine() { - MAX_DESCRIPTORS = 0; - EngineHandle = epoll_create(GetMaxFds()); + int max = ulimit(4, 0); + if (max > 0) + { + MAX_DESCRIPTORS = max; + } + else + { + 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 is not a maximum, just a hint at the eventual number of sockets that may be polled. + EngineHandle = epoll_create(GetMaxFds() / 4); if (EngineHandle == -1) { ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Could not initialize socket engine: %s", strerror(errno)); ServerInstance->Logs->Log("SOCKET",DEFAULT, "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now."); - printf("ERROR: Could not initialize socket engine: %s\n", strerror(errno)); + printf("ERROR: Could not initialize epoll socket engine: %s\n", strerror(errno)); printf("ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n"); ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); } - CurrentSetSize = 0; ref = new EventHandler* [GetMaxFds()]; events = new struct epoll_event[GetMaxFds()]; @@ -45,59 +83,89 @@ EPollEngine::~EPollEngine() delete[] events; } -bool EPollEngine::AddFd(EventHandler* eh) +static int mask_to_epoll(int event_mask) +{ + int rv = 0; + if (event_mask & (FD_WANT_POLL_READ | FD_WANT_POLL_WRITE | FD_WANT_SINGLE_WRITE)) + { + // we need to use standard polling on this FD + if (event_mask & (FD_WANT_POLL_READ | FD_WANT_FAST_READ)) + rv |= EPOLLIN; + if (event_mask & (FD_WANT_POLL_WRITE | FD_WANT_FAST_WRITE | FD_WANT_SINGLE_WRITE)) + rv |= EPOLLOUT; + } + else + { + // we can use edge-triggered polling on this FD + rv = EPOLLET; + if (event_mask & (FD_WANT_FAST_READ | FD_WANT_EDGE_READ)) + rv |= EPOLLIN; + if (event_mask & (FD_WANT_FAST_WRITE | FD_WANT_EDGE_WRITE)) + rv |= EPOLLOUT; + } + return rv; +} + +bool EPollEngine::AddFd(EventHandler* eh, int event_mask) { int fd = eh->GetFd(); if ((fd < 0) || (fd > GetMaxFds() - 1)) { - ServerInstance->Logs->Log("SOCKET",DEBUG,"Out of range FD"); + ServerInstance->Logs->Log("SOCKET",DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); return false; } - if (GetRemainingFds() <= 1) - return false; - if (ref[fd]) + { + ServerInstance->Logs->Log("SOCKET",DEBUG,"Attempt to add duplicate fd: %d", fd); return false; + } struct epoll_event ev; - memset(&ev,0,sizeof(struct epoll_event)); - eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT; + memset(&ev,0,sizeof(ev)); + ev.events = mask_to_epoll(event_mask); ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev); if (i < 0) { + ServerInstance->Logs->Log("SOCKET",DEBUG,"Error adding fd: %d to socketengine: %s", fd, strerror(errno)); return false; } ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd); ref[fd] = eh; + SocketEngine::SetEventMask(eh, event_mask); CurrentSetSize++; return true; } -void EPollEngine::WantWrite(EventHandler* eh) +void EPollEngine::OnSetEvent(EventHandler* eh, int old_mask, int new_mask) { - /** Use oneshot so that the system removes the writeable - * status for us and saves us a call. - */ - struct epoll_event ev; - memset(&ev,0,sizeof(struct epoll_event)); - ev.events = EPOLLOUT; - ev.data.fd = eh->GetFd(); - epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev); + int old_events = mask_to_epoll(old_mask); + int new_events = mask_to_epoll(new_mask); + if (old_events != new_events) + { + // ok, we actually have something to tell the kernel about + struct epoll_event ev; + memset(&ev,0,sizeof(ev)); + ev.events = new_events; + ev.data.fd = eh->GetFd(); + epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev); + } } bool EPollEngine::DelFd(EventHandler* eh, bool force) { int fd = eh->GetFd(); if ((fd < 0) || (fd > GetMaxFds() - 1)) + { + ServerInstance->Logs->Log("SOCKET",DEBUG,"DelFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); return false; + } struct epoll_event ev; - memset(&ev,0,sizeof(struct epoll_event)); - eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT; + memset(&ev,0,sizeof(ev)); ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev); @@ -108,40 +176,15 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force) } ref[fd] = NULL; - CurrentSetSize--; ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); + CurrentSetSize--; return true; } -int EPollEngine::GetMaxFds() -{ - if (MAX_DESCRIPTORS) - return MAX_DESCRIPTORS; - - int max = ulimit(4, 0); - if (max > 0) - { - MAX_DESCRIPTORS = max; - return max; - } - else - { - 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); - } - return 0; -} - -int EPollEngine::GetRemainingFds() -{ - return GetMaxFds() - CurrentSetSize; -} - int EPollEngine::DispatchEvents() { - socklen_t codesize; + socklen_t codesize = sizeof(int); int errcode; int i = epoll_wait(EngineHandle, events, GetMaxFds() - 1, 1000); @@ -149,11 +192,13 @@ int EPollEngine::DispatchEvents() for (int j = 0; j < i; j++) { + EventHandler* eh = ref[events[j].data.fd]; + if (!eh) + continue; if (events[j].events & EPOLLHUP) { ErrorEvents++; - if (ref[events[j].data.fd]) - ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0); + eh->HandleEvent(EVENT_ERROR, 0); continue; } if (events[j].events & EPOLLERR) @@ -162,26 +207,32 @@ int EPollEngine::DispatchEvents() /* Get error number */ if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) errcode = errno; - if (ref[events[j].data.fd]) - ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode); + eh->HandleEvent(EVENT_ERROR, errcode); continue; } + int mask = eh->GetEventMask(); + if (events[j].events & EPOLLIN) + mask &= ~FD_READ_WILL_BLOCK; if (events[j].events & EPOLLOUT) { - WriteEvents++; - struct epoll_event ev; - memset(&ev,0,sizeof(struct epoll_event)); - ev.events = EPOLLIN; - ev.data.fd = events[j].data.fd; - epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev); - if (ref[events[j].data.fd]) - ref[events[j].data.fd]->HandleEvent(EVENT_WRITE); + mask &= ~FD_WRITE_WILL_BLOCK; + if (mask & FD_WANT_SINGLE_WRITE) + { + int nm = mask & ~FD_WANT_SINGLE_WRITE; + OnSetEvent(eh, mask, nm); + mask = nm; + } } - else + SetEventMask(eh, mask); + if (events[j].events & EPOLLIN) { ReadEvents++; - if (ref[events[j].data.fd]) - ref[events[j].data.fd]->HandleEvent(EVENT_READ); + eh->HandleEvent(EVENT_READ); + } + if (events[j].events & EPOLLOUT) + { + WriteEvents++; + eh->HandleEvent(EVENT_WRITE); } } @@ -193,3 +244,7 @@ std::string EPollEngine::GetName() return "epoll"; } +SocketEngine* CreateSocketEngine() +{ + return new EPollEngine; +}