Remove unneeded "fd" member of issl_session

[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 2f09cc30556e7b4cfe189bf4ed675ecc6954963c..15f5567a4a90d2609d30177168417e4f5443c4fe 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -2,7 +2,7 @@
  *       | Inspire Internet Relay Chat Daemon |
  *       +------------------------------------+
  *
- *  InspIRCd: (C) 2002-2008 InspIRCd Development Team
+ *  InspIRCd: (C) 2002-2009 InspIRCd Development Team
  * See: http://www.inspircd.org/wiki/index.php/Credits
  *
  * This program is free but copyrighted software; see
@@ -14,6 +14,7 @@
 #include "inspircd.h"
 #include "threadengines/threadengine_pthread.h"
 #include <pthread.h>
+#include <signal.h>
 
 pthread_mutex_t MyMutex = PTHREAD_MUTEX_INITIALIZER;
 
@@ -87,6 +88,13 @@ bool PThreadEngine::Mutex(bool enable)
 
 void* PThreadEngine::Entry(void* parameter)
 {
+       /* Recommended by nenolod, signal safety on a per-thread basis */
+       sigset_t set;
+       sigemptyset(&set);
+       sigaddset(&set, SIGPIPE);
+       if(pthread_sigmask(SIG_BLOCK, &set, NULL))
+               signal(SIGPIPE, SIG_IGN);
+
        ThreadEngine * pt = (ThreadEngine*)parameter;
        pt->Run();
        return NULL;
@@ -105,3 +113,29 @@ void PThreadEngine::FreeThread(Thread* thread)
        }
 }
 
+MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+{
+}
+
+Mutex* MutexFactory::CreateMutex()
+{
+       return new PosixMutex(this->ServerInstance);
+}
+
+PosixMutex::PosixMutex(InspIRCd* Instance) : Mutex(Instance)
+{
+       pthread_mutex_init(&putex, NULL);
+}
+
+PosixMutex::~PosixMutex()
+{
+       pthread_mutex_destroy(&putex);
+}
+
+void PosixMutex::Enable(bool enable)
+{
+       if (enable)
+               pthread_mutex_lock(&putex);
+       else
+               pthread_mutex_unlock(&putex);
+}