Measure bandwidth statistics from the socket engine (kiloBITS per second in, out...

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

diff --git a/src/socketengines/socketengine_epoll.cpp b/src/socketengines/socketengine_epoll.cpp
index 6028ce2e1297d68f3cf145ae3176630e4cf6ff47..5552cccf6b2a9167f4f72f03b7445cbfa60ad682 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -20,7 +20,8 @@
 EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 {
        MAX_DESCRIPTORS = 0;
-       EngineHandle = epoll_create(GetMaxFds());
+       // 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)
        {
@@ -50,15 +51,21 @@ bool EPollEngine::AddFd(EventHandler* eh)
        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)
+       {
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"No remaining FDs cannot add fd: %d", fd);
                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));
@@ -67,6 +74,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
        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;
        }
 
@@ -93,7 +101,10 @@ 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));