X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengines%2Fsocketengine_epoll.cpp;h=f2837777ad7ec7a3ac11e6116be84bc70ca9ca0e;hb=a785f350fd584d87f3b84bbaff569ecb59c29f04;hp=0ce6649375a723ffa98d93e92a015d1a298e9615;hpb=2496449155c339c9d6675de643bce04a7fbd304c;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp index 0ce664937..f2837777a 100644 --- a/src/socketengines/socketengine_epoll.cpp +++ b/src/socketengines/socketengine_epoll.cpp @@ -1,24 +1,72 @@ -/* +------------------------------------+ - * | Inspire Internet Relay Chat Daemon | - * +------------------------------------+ +/* + * InspIRCd -- Internet Relay Chat Daemon * - * InspIRCd: (C) 2002-2008 InspIRCd Development Team - * See: http://www.inspircd.org/wiki/index.php/Credits + * Copyright (C) 2009 Daniel De Graaf + * Copyright (C) 2007-2008 Craig Edwards * - * This program is free but copyrighted software; see - * the file COPYING for details. + * This file is part of InspIRCd. InspIRCd is free software: you can + * redistribute it and/or modify it under the terms of the GNU General Public + * License as published by the Free Software Foundation, version 2. * - * --------------------------------------------------- + * This program is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS + * FOR A PARTICULAR PURPOSE. See the GNU General Public License for more + * details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ + +#include +#include +#include #include "inspircd.h" #include "exitcodes.h" -#include "socketengines/socketengine_epoll.h" +#include "socketengine.h" +#include #include +#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 { - MAX_DESCRIPTORS = 0; +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 void DelFd(EventHandler* eh); + virtual int DispatchEvents(); + virtual std::string GetName(); +}; + +EPollEngine::EPollEngine() +{ + CurrentSetSize = 0; + 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!"); + std::cout << "ERROR: Can't determine maximum number of open sockets!" << std::endl; + ServerInstance->QuickExit(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); @@ -26,11 +74,10 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance) { 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: Your kernel probably does not have the proper features. This is a fatal error, exiting now.\n"); - ServerInstance->Exit(EXIT_STATUS_SOCKETENGINE); + std::cout << "ERROR: Could not initialize epoll socket engine: " << strerror(errno) << std::endl; + std::cout << "ERROR: Your kernel probably does not have the proper features. This is a fatal error, exiting now." << std::endl; + ServerInstance->QuickExit(EXIT_STATUS_SOCKETENGINE); } - CurrentSetSize = 0; ref = new EventHandler* [GetMaxFds()]; events = new struct epoll_event[GetMaxFds()]; @@ -45,18 +92,35 @@ EPollEngine::~EPollEngine() delete[] events; } -bool EPollEngine::AddFd(EventHandler* eh) +static unsigned mask_to_epoll(int event_mask) { - int fd = eh->GetFd(); - if ((fd < 0) || (fd > GetMaxFds() - 1)) + unsigned rv = 0; + if (event_mask & (FD_WANT_POLL_READ | FD_WANT_POLL_WRITE | FD_WANT_SINGLE_WRITE)) { - ServerInstance->Logs->Log("SOCKET",DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); - return false; + // 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; +} - if (GetRemainingFds() <= 1) +bool EPollEngine::AddFd(EventHandler* eh, int event_mask) +{ + int fd = eh->GetFd(); + if ((fd < 0) || (fd > GetMaxFds() - 1)) { - ServerInstance->Logs->Log("SOCKET",DEBUG,"No remaining FDs cannot add fd: %d", fd); + ServerInstance->Logs->Log("SOCKET",DEBUG,"AddFd out of range: (fd: %d, max: %d)", fd, GetMaxFds()); return false; } @@ -68,7 +132,7 @@ bool EPollEngine::AddFd(EventHandler* eh) struct epoll_event ev; memset(&ev,0,sizeof(ev)); - eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT; + ev.events = mask_to_epoll(event_mask); ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev); if (i < 0) @@ -80,73 +144,49 @@ bool EPollEngine::AddFd(EventHandler* eh) 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(ev)); - ev.events = EPOLLIN | EPOLLOUT; - ev.data.fd = eh->GetFd(); - epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev); + unsigned old_events = mask_to_epoll(old_mask); + unsigned 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) +void EPollEngine::DelFd(EventHandler* eh) { 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; + return; } struct epoll_event ev; memset(&ev,0,sizeof(ev)); - eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT; ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev); - if (i < 0 && !force) + if (i < 0) { - ServerInstance->Logs->Log("SOCKET",DEBUG,"Cant remove socket: %s", strerror(errno)); - return false; + ServerInstance->Logs->Log("SOCKET",DEBUG,"epoll_ctl can't remove socket: %s", strerror(errno)); } ref[fd] = NULL; - CurrentSetSize--; ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd); - 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; + CurrentSetSize--; } int EPollEngine::DispatchEvents() @@ -154,16 +194,23 @@ int EPollEngine::DispatchEvents() socklen_t codesize = sizeof(int); int errcode; int i = epoll_wait(EngineHandle, events, GetMaxFds() - 1, 1000); + ServerInstance->UpdateTime(); TotalEvents += i; for (int j = 0; j < i; j++) { + EventHandler* eh = ref[events[j].data.fd]; + if (!eh) + { + ServerInstance->Logs->Log("SOCKET",DEBUG,"Got event on unknown fd: %d", events[j].data.fd); + epoll_ctl(EngineHandle, EPOLL_CTL_DEL, events[j].data.fd, &events[j]); + 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) @@ -172,26 +219,35 @@ 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(ev)); - 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 (eh != ref[events[j].data.fd]) + // whoa! we got deleted, better not give out the write event + continue; + } + if (events[j].events & EPOLLOUT) + { + WriteEvents++; + eh->HandleEvent(EVENT_WRITE); } } @@ -203,3 +259,7 @@ std::string EPollEngine::GetName() return "epoll"; } +SocketEngine* CreateSocketEngine() +{ + return new EPollEngine; +}