Cut down on debug on restart

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index cbf800a5c254eaff92ad5ab4d5f65be253c5a73e..245509a304e065da5b5fa73f6f55516d8acef40d 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -2,12 +2,9 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd is copyright (C) 2002-2006 ChatSpike-Dev.
- *                       E-mail:
- *                <brain@chatspike.net>
- *                <Craig@chatspike.net>
+ *  InspIRCd: (C) 2002-2007 InspIRCd Development Team
+ * See: http://www.inspircd.org/wiki/index.php/Credits
  *
- * Written by Craig Edwards, Craig McLure, and others.
  * This program is free but copyrighted software; see
  *            the file COPYING for details.
  *
@@ -43,17 +40,17 @@ bool EPollEngine::AddFd(EventHandler* eh)
        int fd = eh->GetFd();
        if ((fd < 0) || (fd > MAX_DESCRIPTORS))
        {
-               ServerInstance->Log(DEFAULT,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
+               ServerInstance->Log(DEBUG,"ERROR: FD of %d added above max of %d",fd,MAX_DESCRIPTORS);
                return false;
        }
        if (GetRemainingFds() <= 1)
        {
-               ServerInstance->Log(DEFAULT,"ERROR: System out of file descriptors!");
+               ServerInstance->Log(DEBUG,"ERROR: System out of file descriptors!");
                return false;
        }
        if (ref[fd])
        {
-               ServerInstance->Log(DEFAULT,"Slot %d already occupied",fd);
+               ServerInstance->Log(DEBUG,"Slot %d already occupied",fd);
                return false;
        }
 
@@ -79,18 +76,18 @@ bool EPollEngine::AddFd(EventHandler* eh)
 
 void EPollEngine::WantWrite(EventHandler* eh)
 {
+       /** Use oneshot so that the system removes the writeable
+        * status for us and saves us a call.
+        */
        struct epoll_event ev;
-       ev.events = EPOLLOUT | EPOLLONESHOT;
+       memset(&ev,0,sizeof(struct epoll_event));
+       ev.events = EPOLLOUT;
        ev.data.fd = eh->GetFd();
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, eh->GetFd(), &ev);
        if (i < 0)
        {
                ServerInstance->Log(DEBUG,"epoll: Could not set want write on fd %d!",eh->GetFd());
        }
-       else
-       {
-               ServerInstance->Log(DEBUG,"epoll: WantWrite set on %d",eh->GetFd());
-       }
 }
 
 bool EPollEngine::DelFd(EventHandler* eh)
@@ -131,14 +128,33 @@ int EPollEngine::GetRemainingFds()
 
 int EPollEngine::DispatchEvents()
 {
+       socklen_t codesize;
+       int errcode;
        int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 150);
        for (int j = 0; j < i; j++)
        {
                ServerInstance->Log(DEBUG,"Handle %s event on fd %d",events[j].events & EPOLLOUT ? "write" : "read", events[j].data.fd);
+               if (events[j].events & EPOLLHUP)
+               {
+                       ServerInstance->Log(DEBUG,"Handle error event on fd %d", events[j].data.fd);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, 0);
+                       continue;
+               }
+               if (events[j].events & EPOLLERR)
+               {
+                       /* Get error number */
+                       if (getsockopt(events[j].data.fd, SOL_SOCKET, SO_ERROR, &errcode, &codesize) < 0)
+                               errcode = errno;
+                       ServerInstance->Log(DEBUG,"Handle error event on fd %d: %s", events[j].data.fd, strerror(errcode));
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
+                       continue;
+               }
                if (events[j].events & EPOLLOUT)
                {
-                       ServerInstance->Log(DEBUG,"One shot, we should EPOLL_CTL_MOD here to set it read only.");
                        struct epoll_event ev;
+                       memset(&ev,0,sizeof(struct epoll_event));
                        ev.events = EPOLLIN;
                        ev.data.fd = events[j].data.fd;
                        int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
@@ -146,11 +162,13 @@ int EPollEngine::DispatchEvents()
                        {
                                ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", events[j].data.fd);
                        }
-                       ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
                }
                else
                {
-                       ref[events[j].data.fd]->HandleEvent(EVENT_READ);
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_READ);
                }
        }