Add SERVICE_CUSTOM for services managed by a module

[user/henk/code/inspircd.git] / src / threadengines / threadengine_pthread.cpp

diff --git a/src/threadengines/threadengine_pthread.cpp b/src/threadengines/threadengine_pthread.cpp
index fcb4db444b0b63b8e776721d838b29ed839f099c..3249f442bfb31e5662cfed2d8853eea7b2730f20 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -72,18 +72,21 @@ class ThreadSignalSocket : public EventHandler
                eventfd_write(fd, 1);
        }
 
-       void HandleEvent(EventType et, int errornum)
+       void OnEventHandlerRead() CXX11_OVERRIDE
        {
-               if (et == EVENT_READ)
-               {
-                       eventfd_t dummy;
-                       eventfd_read(fd, &dummy);
-                       parent->OnNotify();
-               }
-               else
-               {
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
+               eventfd_t dummy;
+               eventfd_read(fd, &dummy);
+               parent->OnNotify();
+       }
+
+       void OnEventHandlerWrite() CXX11_OVERRIDE
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+
+       void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+       {
+               ThreadSignalSocket::OnEventHandlerWrite();
        }
 };
 
@@ -92,7 +95,7 @@ SocketThread::SocketThread()
        signal.sock = NULL;
        int fd = eventfd(0, EFD_NONBLOCK);
        if (fd < 0)
-               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+               throw CoreException("Could not create pipe " + std::string(strerror(errno)));
        signal.sock = new ThreadSignalSocket(this, fd);
 }
 #else
@@ -122,18 +125,21 @@ class ThreadSignalSocket : public EventHandler
                write(send_fd, &dummy, 1);
        }
 
-       void HandleEvent(EventType et, int errornum)
+       void OnEventHandlerRead() CXX11_OVERRIDE
+       {
+               char dummy[128];
+               read(fd, dummy, 128);
+               parent->OnNotify();
+       }
+
+       void OnEventHandlerWrite() CXX11_OVERRIDE
+       {
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+
+       void OnEventHandlerError(int errcode) CXX11_OVERRIDE
        {
-               if (et == EVENT_READ)
-               {
-                       char dummy[128];
-                       read(fd, dummy, 128);
-                       parent->OnNotify();
-               }
-               else
-               {
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
+               ThreadSignalSocket::OnEventHandlerWrite();
        }
 };
 
@@ -142,7 +148,7 @@ SocketThread::SocketThread()
        signal.sock = NULL;
        int fds[2];
        if (pipe(fds))
-               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+               throw CoreException("Could not create pipe " + std::string(strerror(errno)));
        signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
 #endif