Make parameter count checks more readable

[user/henk/code/inspircd.git] / src / socketengine_epoll.cpp

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 9057c6d658e246cee67c1c196d9b2c3ae5544bf1..63b1fc10df321c4183462f06e585a3a903589565 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -14,11 +14,8 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
 #include "inspircd.h"
 #include <sys/epoll.h>
-#include <vector>
-#include <string>
 #include "socketengine_epoll.h"
 
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
@@ -55,7 +52,10 @@ bool EPollEngine::AddFd(EventHandler* eh)
                return false;
        }
        if (ref[fd])
+       {
+               ServerInstance->Log(DEFAULT,"Slot %d already occupied",fd);
                return false;
+       }
 
        ref[fd] = eh;
 
@@ -87,17 +87,19 @@ bool EPollEngine::DelFd(EventHandler* eh)
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
-       ref[fd]->Readable() ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+       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)
        {
-               ServerInstance->Log(DEBUG,"epoll: List deletion failure!");
+               ServerInstance->Log(DEBUG,"epoll: List deletion failure: %s",strerror(errno));
                return false;
        }
 
        CurrentSetSize--;
        ref[fd] = NULL;
+
        return true;
 }
 
@@ -111,15 +113,16 @@ int EPollEngine::GetRemainingFds()
        return MAX_DESCRIPTORS - CurrentSetSize;
 }
 
-int EPollEngine::Wait(EventHandler** fdlist)
+int EPollEngine::DispatchEvents()
 {
-       int result = 0;
-
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
        for (int j = 0; j < i; j++)
-               fdlist[result++] = ref[events[j].data.fd];
+       {
+               ServerInstance->Log(DEBUG,"Handle %s event on fd %d",ref[events[j].data.fd]->Readable() ? "read" : "write", ref[events[j].data.fd]->GetFd());
+               ref[events[j].data.fd]->HandleEvent(ref[events[j].data.fd]->Readable() ? EVENT_READ : EVENT_WRITE);
+       }
 
-       return result;
+       return i;
 }
 
 std::string EPollEngine::GetName()