X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=src%2Fsocketengine_epoll.cpp;h=4ed68ca57a1f913aadfb0cb85e86fe5d9b3136cd;hb=46ff0bed0047c4cd05828c5f46dce63176e5084b;hp=c1aab07d888664c886d3bcb8b41fa6e1ed4657b9;hpb=dc5d99a9543f5027cc5d4f4ffc5716eaf7e933ec;p=user%2Fhenk%2Fcode%2Finspircd.git diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp index c1aab07d8..4ed68ca57 100644 --- a/src/socketengine_epoll.cpp +++ b/src/socketengine_epoll.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 "socketengine_epoll.h" @@ -24,11 +22,11 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance) if (EngineHandle == -1) { - ServerInstance->Log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features."); - 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->Log(SPARSE,"ERROR: Could not initialize socket engine: %s", strerror(errno)); + ServerInstance->Log(SPARSE,"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"); + InspIRCd::Exit(EXIT_STATUS_SOCKETENGINE); } CurrentSetSize = 0; } @@ -42,37 +40,26 @@ bool EPollEngine::AddFd(EventHandler* eh) { int fd = eh->GetFd(); 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,"Slot %d already occupied",fd); return false; - } ref[fd] = eh; - - ServerInstance->Log(DEBUG,"***** Add socket %d",fd); - struct epoll_event ev; memset(&ev,0,sizeof(struct epoll_event)); - ServerInstance->Log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd); eh->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT; ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_ADD, fd, &ev); if (i < 0) { - ServerInstance->Log(DEBUG,"epoll: List insertion failure!"); return false; } + ServerInstance->Log(DEBUG,"New file descriptor: %d", fd); CurrentSetSize++; return true; } @@ -83,19 +70,14 @@ void EPollEngine::WantWrite(EventHandler* eh) * status for us and saves us a call. */ struct epoll_event ev; - ev.events = EPOLLOUT | EPOLLONESHOT; + memset(&ev,0,sizeof(struct epoll_event)); + ev.events = EPOLLOUT; ev.data.fd = eh->GetFd(); - int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev); - if (i < 0) - { - ServerInstance->Log(DEBUG,"epoll: Could not set want write on fd %d!",eh->GetFd()); - } + epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev); } -bool EPollEngine::DelFd(EventHandler* eh) +bool EPollEngine::DelFd(EventHandler* eh, bool force) { - ServerInstance->Log(DEBUG,"EPollEngine::DelFd(%d)",eh->GetFd()); - int fd = eh->GetFd(); if ((fd < 0) || (fd > MAX_DESCRIPTORS)) return false; @@ -106,15 +88,13 @@ bool EPollEngine::DelFd(EventHandler* eh) ev.data.fd = fd; int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev); - if (i < 0) - { - ServerInstance->Log(DEBUG,"epoll: List deletion failure: %s",strerror(errno)); + if (i < 0 && !force) return false; - } CurrentSetSize--; ref[fd] = NULL; + ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd); return true; } @@ -132,14 +112,13 @@ int EPollEngine::DispatchEvents() { socklen_t codesize; int errcode; - int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 150); + int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000); for (int j = 0; j < i; j++) { - ServerInstance->Log(DEBUG,"Handle %s event on fd %d",events[j].events & EPOLLOUT ? "write" : "read", events[j].data.fd); if (events[j].events & EPOLLHUP) { - ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd); - ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0); + if (ref[events[j].data.fd]) + ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0); continue; } if (events[j].events & EPOLLERR) @@ -147,20 +126,17 @@ int EPollEngine::DispatchEvents() /* Get error number */ if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0) errcode = errno; - ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode)); - ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode); + if (ref[events[j].data.fd]) + ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode); continue; } if (events[j].events & EPOLLOUT) { struct epoll_event ev; + memset(&ev,0,sizeof(struct epoll_event)); ev.events = EPOLLIN; ev.data.fd = events[j].data.fd; - int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev); - if (i < 0) - { - ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", 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); }