Hide the server name/desc better when <options:hideserver> is set.

[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 c1b964430a57b3493a65c2354fed8b25f7216725..7e822faa9b1cf862fbeab19cfce6dd7bb15823c4 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -1,8 +1,10 @@
 /*
  * InspIRCd -- Internet Relay Chat Daemon
  *
+ *   Copyright (C) 2013-2015 Attila Molnar <attilamolnar@hush.com>
+ *   Copyright (C) 2012 Robby <robby@chatbelgie.be>
  *   Copyright (C) 2009-2010 Daniel De Graaf <danieldg@inspircd.org>
- *   Copyright (C) 2008 Craig Edwards <craigedwards@brainbox.cc>
+ *   Copyright (C) 2008, 2010 Craig Edwards <brain@inspircd.org>
  *
  * This file is part of InspIRCd.  InspIRCd is free software: you can
  * redistribute it and/or modify it under the terms of the GNU General Public
@@ -21,13 +23,8 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
-#include <signal.h>
 #include <fcntl.h>
 
-ThreadEngine::ThreadEngine()
-{
-}
-
 static void* entry_point(void* parameter)
 {
        /* Recommended by nenolod, signal safety on a per-thread basis */
@@ -44,25 +41,14 @@ static void* entry_point(void* parameter)
 
 void ThreadEngine::Start(Thread* thread)
 {
-       ThreadData* data = new ThreadData;
-       thread->state = data;
-
-       if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
-       {
-               thread->state = NULL;
-               delete data;
+       if (pthread_create(&thread->state.pthread_id, NULL, entry_point, thread) != 0)
                throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
-       }
 }
 
-ThreadEngine::~ThreadEngine()
-{
-}
-
-void ThreadData::FreeThread(Thread* thread)
+void ThreadEngine::Stop(Thread* thread)
 {
        thread->SetExitFlag();
-       pthread_join(pthread_id, NULL);
+       pthread_join(thread->state.pthread_id, NULL);
 }
 
 #ifdef HAS_EVENTFD
@@ -75,11 +61,12 @@ class ThreadSignalSocket : public EventHandler
        ThreadSignalSocket(SocketThread* p, int newfd) : parent(p)
        {
                SetFd(newfd);
-               ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+               SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
        }
 
        ~ThreadSignalSocket()
        {
+               SocketEngine::Close(this);
        }
 
        void Notify()
@@ -87,26 +74,30 @@ class ThreadSignalSocket : public EventHandler
                eventfd_write(fd, 1);
        }
 
-       void HandleEvent(EventType et, int errornum)
+       void OnEventHandlerRead() CXX11_OVERRIDE
+       {
+               eventfd_t dummy;
+               eventfd_read(fd, &dummy);
+               parent->OnNotify();
+       }
+
+       void OnEventHandlerWrite() CXX11_OVERRIDE
        {
-               if (et == EVENT_READ)
-               {
-                       eventfd_t dummy;
-                       eventfd_read(fd, &dummy);
-                       parent->OnNotify();
-               }
-               else
-               {
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+
+       void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+       {
+               ThreadSignalSocket::OnEventHandlerWrite();
        }
 };
 
 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
@@ -120,13 +111,14 @@ class ThreadSignalSocket : public EventHandler
                parent(p), send_fd(sendfd)
        {
                SetFd(recvfd);
-               ServerInstance->SE->NonBlocking(fd);
-               ServerInstance->SE->AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
+               SocketEngine::NonBlocking(fd);
+               SocketEngine::AddFd(this, FD_WANT_FAST_READ | FD_WANT_NO_WRITE);
        }
 
        ~ThreadSignalSocket()
        {
                close(send_fd);
+               SocketEngine::Close(this);
        }
 
        void Notify()
@@ -135,26 +127,30 @@ 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
        {
-               if (et == EVENT_READ)
-               {
-                       char dummy[128];
-                       read(fd, dummy, 128);
-                       parent->OnNotify();
-               }
-               else
-               {
-                       ServerInstance->GlobalCulls.AddItem(this);
-               }
+               ServerInstance->GlobalCulls.AddItem(this);
+       }
+
+       void OnEventHandlerError(int errcode) CXX11_OVERRIDE
+       {
+               ThreadSignalSocket::OnEventHandlerWrite();
        }
 };
 
 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
@@ -166,4 +162,9 @@ void SocketThread::NotifyParent()
 
 SocketThread::~SocketThread()
 {
+       if (signal.sock)
+       {
+               signal.sock->cull();
+               delete signal.sock;
+       }
 }