A load of classes dont inherit from classbase, and they should. fix.

[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 9da569b8f85c4bd7e57ad9732b158e9b86db54f0..1a0c5d53ecf75e3a00ebb56c2d1acf366aa36ba9 100644 (file)
--- a/src/socketengines/socketengine_epoll.cpp
+++ b/src/socketengines/socketengine_epoll.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -22,8 +22,8 @@ EPollEngine::EPollEngine(InspIRCd* Instance) : SocketEngine(Instance)
 
        if (EngineHandle == -1)
        {
-               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.");
+               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);
@@ -41,7 +41,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               ServerInstance->Log(DEBUG,"Out of range FD");
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"Out of range FD");
                return false;
        }
 
@@ -61,7 +61,7 @@ bool EPollEngine::AddFd(EventHandler* eh)
                return false;
        }
 
-       ServerInstance->Log(DEBUG,"New file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET",DEBUG,"New file descriptor: %d", fd);
 
        ref[fd] = eh;
        CurrentSetSize++;
@@ -94,14 +94,14 @@ bool EPollEngine::DelFd(EventHandler* eh, bool force)
 
        if (i < 0 && !force)
        {
-               ServerInstance->Log(DEBUG,"Cant remove socket: %s", strerror(errno));
+               ServerInstance->Logs->Log("SOCKET",DEBUG,"Cant remove socket: %s", strerror(errno));
                return false;
        }
 
        ref[fd] = NULL;
        CurrentSetSize--;
 
-       ServerInstance->Log(DEBUG,"Remove file descriptor: %d", fd);
+       ServerInstance->Logs->Log("SOCKET",DEBUG,"Remove file descriptor: %d", fd);
        return true;
 }
 
@@ -120,16 +120,21 @@ int EPollEngine::DispatchEvents()
        socklen_t codesize;
        int errcode;
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000);
+
+       TotalEvents += i;
+
        for (int j = 0; j < i; j++)
        {
                if (events[j].events & EPOLLHUP)
                {
+                       ErrorEvents++;
                        if (ref[events[j].data.fd])
                                ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
                        continue;
                }
                if (events[j].events & EPOLLERR)
                {
+                       ErrorEvents++;
                        /* Get error number */
                        if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
                                errcode = errno;
@@ -139,6 +144,7 @@ int EPollEngine::DispatchEvents()
                }
                if (events[j].events & EPOLLOUT)
                {
+                       WriteEvents++;
                        struct epoll_event ev;
                        memset(&ev,0,sizeof(struct epoll_event));
                        ev.events = EPOLLIN;
@@ -149,6 +155,7 @@ int EPollEngine::DispatchEvents()
                }
                else
                {
+                       ReadEvents++;
                        if (ref[events[j].data.fd])
                                ref[events[j].data.fd]->HandleEvent(EVENT_READ);
                }