Add OnParameterMissing to modehandler, called when the mode handler should have a...

[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..2f09cc30556e7b4cfe189bf4ed675ecc6954963c 100644 (file)
--- a/src/threadengines/threadengine_pthread.cpp
+++ b/src/threadengines/threadengine_pthread.cpp
@@ -11,17 +11,6 @@
  * ---------------------------------------------------
  */
 
-/* $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>
@@ -36,27 +25,54 @@ void PThreadEngine::Create(Thread* thread_to_init)
 {
        pthread_attr_t attribs;
        pthread_attr_init(&attribs);
+       pthread_attr_setdetachstate(&attribs, PTHREAD_CREATE_JOINABLE);
        pthread_t* MyPThread = new pthread_t;
 
+       /* Create a thread in a mutex. This prevents whacking the member value NewThread,
+        * and also prevents recursive creation of threads by mistake (instead, the thread
+        * will just deadlock itself)
+        */
+       Mutex(true);
+
        if (pthread_create(MyPThread, &attribs, PThreadEngine::Entry, (void*)this) != 0)
        {
                delete MyPThread;
+               Mutex(false);
                throw CoreException("Unable to create new PThreadEngine: " + std::string(strerror(errno)));
        }
 
+       pthread_attr_destroy(&attribs);
+
        NewThread = thread_to_init;
        NewThread->Creator = this;
        NewThread->Extend("pthread", MyPThread);
+
+       /* Always unset a mutex if you set it */
+       Mutex(false);
+
+       /* Wait for the PThreadEngine::Run method to take a copy of the
+        * pointer and clear this member value
+        */
+       while (NewThread)
+               usleep(1000);
 }
 
 PThreadEngine::~PThreadEngine()
 {
-       //pthread_kill(this->MyPThread, SIGKILL);
 }
 
 void PThreadEngine::Run()
 {
-       NewThread->Run();
+       /* Take a copy of the member value, then clear it. Do this
+        * in a mutex so that we can be sure nothing else is looking
+        * at it.
+        */
+       Mutex(true);
+       Thread* nt = NewThread;
+       NewThread = NULL;
+       Mutex(false);
+       /* Now we have our own safe copy, call the object on it */
+       nt->Run();
 }
 
 bool PThreadEngine::Mutex(bool enable)
@@ -81,6 +97,10 @@ void PThreadEngine::FreeThread(Thread* thread)
        pthread_t* pthread = NULL;
        if (thread->GetExt("pthread", pthread))
        {
+               thread->SetExitFlag();
+               int rc;
+               void* status;
+               rc = pthread_join(*pthread, &status);
                delete pthread;
        }
 }