Added <options:notimesync> to the example config

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

diff --git a/src/socketengine_epoll.cpp b/src/socketengine_epoll.cpp
index 7d35997c567acaec7a8750cf15d79e8705132056..54d6ff7c1eca2e0e19bbf5adc9096cac747d30e3 100644 (file)
--- a/src/socketengine_epoll.cpp
+++ b/src/socketengine_epoll.cpp
@@ -77,6 +77,21 @@ bool EPollEngine::AddFd(EventHandler* eh)
        return true;
 }
 
+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;
+       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());
+       }
+}
+
 bool EPollEngine::DelFd(EventHandler* eh)
 {
        ServerInstance->Log(DEBUG,"EPollEngine::DelFd(%d)",eh->GetFd());
@@ -91,15 +106,15 @@ bool EPollEngine::DelFd(EventHandler* eh)
        ev.data.fd = fd;
        int i = epoll_ctl(EngineHandle, EPOLL_CTL_DEL, fd, &ev);
 
-       CurrentSetSize--;
-       ref[fd] = NULL;
-
        if (i < 0)
        {
                ServerInstance->Log(DEBUG,"epoll: List deletion failure: %s",strerror(errno));
                return false;
        }
 
+       CurrentSetSize--;
+       ref[fd] = NULL;
+
        return true;
 }
 
@@ -115,11 +130,45 @@ int EPollEngine::GetRemainingFds()
 
 int EPollEngine::DispatchEvents()
 {
-       int i = epoll_wait(EngineHandle, events, MAX_DESCRIPTORS, 50);
+       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",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);
+               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);
+                       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));
+                       ref[events[j].data.fd]->HandleEvent(EVENT_ERROR, errcode);
+                       continue;
+               }
+               if (events[j].events & EPOLLOUT)
+               {
+                       struct epoll_event ev;
+                       ev.events = EPOLLIN;
+                       ev.data.fd = events[j].data.fd;
+                       int i = epoll_ctl(EngineHandle, EPOLL_CTL_MOD, events[j].data.fd, &ev);
+                       if (i < 0)
+                       {
+                               ServerInstance->Log(DEBUG,"epoll: Could not reset fd %d!", events[j].data.fd);
+                       }
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_WRITE);
+               }
+               else
+               {
+                       if (ref[events[j].data.fd])
+                               ref[events[j].data.fd]->HandleEvent(EVENT_READ);
+               }
        }
 
        return i;