Make log targets in config space-seperated (ie: 'USERINPUT USEROUTPUT') like the...

[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 89b1ea1ef0a199c90d5a4d61b9facba6ebb2559b..ccfa0f769090ebe4c827307a50405e147d594dc2 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->Log(DEFAULT, "ERROR: Could not initialize socket engine: %s", strerror(errno));
+               ServerInstance->Log(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);
@@ -38,7 +38,6 @@ EPollEngine::~EPollEngine()
 
 bool EPollEngine::AddFd(EventHandler* eh)
 {
-       ServerInstance->Log(DEBUG,"Add new fd: %d", eh->GetFd());
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
@@ -122,18 +121,20 @@ int EPollEngine::DispatchEvents()
        int errcode;
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 1000);
 
-       ServerInstance->Log(DEBUG,"DispatchEvents num events = %d of %d", i, CurrentSetSize);
+       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;
@@ -143,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;
@@ -153,6 +155,7 @@ int EPollEngine::DispatchEvents()
                }
                else
                {
+                       ReadEvents++;
                        if (ref[events[j].data.fd])
                                ref[events[j].data.fd]->HandleEvent(EVENT_READ);
                }