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 da120bfab79bbba6eec1cb15d945d33892224ab1..59ab8f4021b804280d1b0a3e05886ef800d38921 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -2,8 +2,8 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
- * See: http://www.inspircd.org/wiki/index.php/Credits
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
+ * See: http://wiki.inspircd.org/Credits
  *
  * This program is free but copyrighted software; see
  *         the file COPYING for details.
@@ -11,77 +11,135 @@
  * ---------------------------------------------------
  */
 
-/* $Core: libIRCDthreadengine */
-
-/*********        DEFAULTS       **********/
-/* $ExtraSources: socketengines/socketengine_pthread.cpp */
-/* $ExtraObjects: socketengine_pthread.o */
-
-/* $If: USE_WIN32 */
-/* $ExtraSources: socketengines/socketengine_win32.cpp */
-/* $ExtraObjects: socketengine_win32.o */
-/* $EndIf */
-
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
+#include <signal.h>
+#include <fcntl.h>
 
-pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER;
+ThreadEngine::ThreadEngine()
+{
+}
 
-PThreadEngine::PThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
+static void* entry_point(void* parameter)
 {
+       /* Recommended by nenolod, signal safety on a per-thread basis */
+       sigset_t set;
+       sigemptyset(&set);
+       sigaddset(&set, SIGPIPE);
+       pthread_sigmask(SIG_BLOCK, &set, NULL);
+
+       Thread* pt = static_cast<Thread*>(parameter);
+       pt->Run();
+       return parameter;
 }
 
-void PThreadEngine::Create(Thread* thread_to_init)
+
+void ThreadEngine::Start(Thread* thread)
 {
-       pthread_attr_t attribs;
-       pthread_attr_init(&attribs);
-       pthread_t* MyPThread = new pthread_t;
+       ThreadData* data = new ThreadData;
+       thread->state = data;
 
-       if (pthread_create(MyPThread, &attribs, PThreadEngine::Entry, (void*)this) != 0)
+       if (pthread_create(&data->pthread_id, NULL, entry_point, thread) != 0)
        {
-               delete MyPThread;
-               throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
+               thread->state = NULL;
+               delete data;
+               throw CoreException("Unable to create new thread: " + std::string(strerror(errno)));
        }
-
-       NewThread = thread_to_init;
-       NewThread->Creator = this;
-       NewThread->Extend("pthread", MyPThread);
 }
 
-PThreadEngine::~PThreadEngine()
+ThreadEngine::~ThreadEngine()
 {
-       //pthread_kill(this->MyPThread, SIGKILL);
 }
 
-void PThreadEngine::Run()
+void ThreadData::FreeThread(Thread* thread)
 {
-       NewThread->Run();
+       thread->SetExitFlag();
+       pthread_join(pthread_id, NULL);
 }
 
-bool PThreadEngine::Mutex(bool enable)
+#ifdef HAS_EVENTFD
+#include <sys/eventfd.h>
+
+class ThreadSignalSocket : public BufferedSocket
 {
-       if (enable)
-               pthread_mutex_lock(&MyMutex);
-       else
-               pthread_mutex_unlock(&MyMutex);
+       SocketThread* parent;
+ public:
+       ThreadSignalSocket(SocketThread* p, int newfd) : BufferedSocket(newfd), parent(p) {}
 
-       return false;
-}
+       ~ThreadSignalSocket()
+       {
+       }
+
+       void Notify()
+       {
+               eventfd_write(fd, 1);
+       }
+
+       void OnDataReady()
+       {
+               recvq.clear();
+               parent->OnNotify();
+       }
+
+       void OnError(BufferedSocketError)
+       {
+       }
+};
 
-void* PThreadEngine::Entry(void* parameter)
+SocketThread::SocketThread()
 {
-       ThreadEngine * pt = (ThreadEngine*)parameter;
-       pt->Run();
-       return NULL;
+       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
 
-void PThreadEngine::FreeThread(Thread* thread)
+class ThreadSignalSocket : public BufferedSocket
 {
-       pthread_t* pthread = NULL;
-       if (thread->GetExt("pthread", pthread))
+       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()
        {
-               delete pthread;
+               recvq.clear();
+               parent->OnNotify();
        }
+
+       void OnError(BufferedSocketError)
+       {
+       }
+};
+
+SocketThread::SocketThread()
+{
+       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
 
+void SocketThread::NotifyParent()
+{
+       signal.sock->Notify();
+}
+
+SocketThread::~SocketThread()
+{
+}