Remove InspIRCd* parameters and fields

[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 9fc9cc4b4f0a5b3d39ec17fbadd8a4c4e85f16da..59ab8f4021b804280d1b0a3e05886ef800d38921 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -15,8 +15,9 @@
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
 #include <signal.h>
+#include <fcntl.h>
 
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+ThreadEngine::ThreadEngine()
 {
 }
 
@@ -28,58 +29,117 @@ static void* entry_point(void* parameter)
        sigaddset(&set, SIGPIPE);
        pthread_sigmask(SIG_BLOCK, &set, NULL);
 
-       Thread* pt = reinterpret_cast<Thread*>(parameter);
+       Thread* pt = static_cast<Thread*>(parameter);
        pt->Run();
        return parameter;
 }
 
 
-void PThreadEngine::Start(Thread* thread)
+void ThreadEngine::Start(Thread* thread)
 {
-       PThreadData* data = new PThreadData;
+       ThreadData* data = new ThreadData;
        thread->state = data;
 
        if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
        {
                thread->state = NULL;
                delete data;
-               throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
+               throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
        }
 }
 
-PThreadEngine::~PThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
 }
 
-void PThreadData::FreeThread(Thread* thread)
+void ThreadData::FreeThread(Thread* thread)
 {
-       thread->SetExitFlag(true);
+       thread->SetExitFlag();
        pthread_join(pthread_id, NULL);
 }
 
-MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
 {
-}
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
+
+       ~ThreadSignalSocket()
+       {
+       }
+
+       void Notify()
+       {
+               eventfd_write(fd, 1);
+       }
+
+       void OnDataReady()
+       {
+               recvq.clear();
+               parent->OnNotify();
+       }
+
+       void OnError(BufferedSocketError)
+       {
+       }
+};
 
-Mutex* MutexFactory::CreateMutex()
+SocketThread::SocketThread()
 {
-       return new PosixMutex();
+       int fd = eventfd(0, O_NONBLOCK);
+       if (fd < 0)
+               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+       signal.sock = new ThreadSignalSocket(this, fd);
 }
+#else
+
+class ThreadSignalSocket : public BufferedSocket
+{
+       SocketThread* parent;
+       int send_fd;
+ public:
+       ThreadSignalSocket(SocketThread* p, int recvfd, int sendfd) :
+               BufferedSocket(recvfd), parent(p), send_fd(sendfd)  {}
+
+       ~ThreadSignalSocket()
+       {
+               close(send_fd);
+       }
+
+       void Notify()
+       {
+               char dummy = '*';
+               write(send_fd, &dummy, 1);
+       }
+
+       void OnDataReady()
+       {
+               recvq.clear();
+               parent->OnNotify();
+       }
+
+       void OnError(BufferedSocketError)
+       {
+       }
+};
 
-PosixMutex::PosixMutex() : Mutex()
+SocketThread::SocketThread()
 {
-       pthread_mutex_init(&putex, NULL);
+       int fds[2];
+       if (pipe(fds))
+               throw new CoreException("Could not create pipe " + std::string(strerror(errno)));
+       signal.sock = new ThreadSignalSocket(this, fds[0], fds[1]);
 }
+#endif
 
-PosixMutex::~PosixMutex()
+void SocketThread::NotifyParent()
 {
-       pthread_mutex_destroy(&putex);
+       signal.sock->Notify();
 }
 
-void PosixMutex::Enable(bool enable)
+SocketThread::~SocketThread()
 {
-       if (enable)
-               pthread_mutex_lock(&putex);
-       else
-               pthread_mutex_unlock(&putex);
 }