Tidy up strlens which are not required

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 4afee1374cb614f622fd776adbb7ac8f5292b1c1..89be6cc416d06077ec2a318b2a76c62243d0f507 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -14,26 +14,21 @@
  * ---------------------------------------------------
  */
 
-#include "inspircd_config.h"
-#include "globals.h"
 #include "inspircd.h"
 #include <sys/epoll.h>
-#include <vector>
-#include <string>
 #include "socketengine_epoll.h"
-#include "helperfuncs.h"
 
-EPollEngine::EPollEngine()
+EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
        EngineHandle = epoll_create(MAX_DESCRIPTORS);
 
        if (EngineHandle == -1)
        {
-               log(SPARSE,"ERROR: Could not initialize socket engine. Your kernel probably does not have the proper features.");
-               log(SPARSE,"ERROR: this is a fatal error, exiting now.");
+               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.");
-               Exit(0);
+               InspIRCd::Exit(ERROR);
        }
        CurrentSetSize = 0;
 }
@@ -43,39 +38,38 @@ EPollEngine::~EPollEngine()
        close(EngineHandle);
 }
 
-bool EPollEngine::AddFd(int fd, bool readable, char type)
+bool EPollEngine::AddFd(EventHandler* eh)
 {
+       int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+               ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
        }
        if (GetRemainingFds() <= 1)
        {
-               log(DEFAULT,"ERROR: System out of file descriptors!");
+               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] = type;
+       ref[fd] = eh;
 
-       if (readable)
-       {
-               log(DEBUG,"Set readbit");
-               ref[fd] |= X_READBIT;
-       }
-       log(DEBUG,"Add socket %d",fd);
+       ServerInstance->Log(DEBUG,"***** Add socket %d",fd);
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
-       log(DEBUG,"epoll: Add socket to events, ep=%d socket=%d",EngineHandle,fd);
-       readable ? ev.events = EPOLLIN : ev.events = EPOLLOUT;
+       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)
        {
-               log(DEBUG,"epoll: List insertion failure!");
+               ServerInstance->Log(DEBUG,"epoll: List insertion failure!");
                return false;
        }
 
@@ -83,26 +77,27 @@ bool EPollEngine::AddFd(int fd, bool readable, char type)
        return true;
 }
 
-bool EPollEngine::DelFd(int fd)
+bool EPollEngine::DelFd(EventHandler* eh)
 {
-       log(DEBUG,"EPollEngine::DelFd(%d)",fd);
+       ServerInstance->Log(DEBUG,"EPollEngine::DelFd(%d)",eh->GetFd());
 
+       int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
                return false;
 
        struct epoll_event ev;
        memset(&ev,0,sizeof(struct epoll_event));
-       ref[fd] && X_READBIT ? 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)
        {
-               log(DEBUG,"epoll: List deletion failure!");
+               ServerInstance->Log(DEBUG,"epoll: List deletion failure!");
                return false;
        }
 
        CurrentSetSize--;
-       ref[fd] = 0;
+       ref[fd] = NULL;
        return true;
 }
 
@@ -116,18 +111,20 @@ int EPollEngine::GetRemainingFds()
        return MAX_DESCRIPTORS - CurrentSetSize;
 }
 
-int EPollEngine::Wait(int* 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++] = 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()
 {
        return "epoll";
 }
+