Fix crash

[user/henk/code/inspircd.git] / src / threadengines / threadengine_win32.cpp

diff --git a/src/threadengines/threadengine_win32.cpp b/src/threadengines/threadengine_win32.cpp
index 025fcad9bb3aedb0d24e26b9a297a25463e8ac41..180ded0ea16f049ce7a42b42b8648b26e8dc7051 100644 (file)
--- a/src/threadengines/threadengine_win32.cpp
+++ b/src/threadengines/threadengine_win32.cpp
@@ -18,31 +18,43 @@ CRITICAL_SECTION MyMutex;
 
 Win32ThreadEngine::Win32ThreadEngine(InspIRCd* Instance) : ThreadEngine(Instance)
 {
+       InitializeCriticalSection(&MyMutex);
 }
 
 void Win32ThreadEngine::Create(Thread* thread_to_init)
 {
+       Mutex(true);
        HANDLE* MyThread = new HANDLE;
        DWORD ThreadId = 0;
 
-       if (!(*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
+       if (NULL == (*MyThread = CreateThread(NULL,0,Win32ThreadEngine::Entry,this,0,&ThreadId)))
        {
                delete MyThread;
-               throw CoreException(std::string("Unable to reate new Win32ThreadEngine: ") + dlerror());
+               Mutex(false);
+               throw CoreException(std::string("Unable to create new Win32ThreadEngine: ") + dlerror());
        }
 
        NewThread = thread_to_init;
        NewThread->Creator = this;
        NewThread->Extend("winthread", MyThread);
+       Mutex(false);
+
+       while (NewThread)
+               SleepEx(100, false);
 }
 
 Win32ThreadEngine::~Win32ThreadEngine()
 {
+       DeleteCriticalSection(&MyMutex);
 }
 
 void Win32ThreadEngine::Run()
 {
-       NewThread->Run();
+       Mutex(true);
+       Thread* nt = NewThread;
+       NewThread = NULL;
+       Mutex(false);
+       nt->Run();
 }
 
 bool Win32ThreadEngine::Mutex(bool enable)
@@ -68,10 +80,35 @@ void Win32ThreadEngine::FreeThread(Thread* thread)
        if (thread->GetExt("winthread", winthread))
        {
                thread->SetExitFlag();
-               int rc;
-               void* status;
                WaitForSingleObject(*winthread,INFINITE);
                delete winthread;
        }
 }
 
+
+MutexFactory::MutexFactory(InspIRCd* Instance) : ServerInstance(Instance)
+{
+}
+
+Mutex* MutexFactory::CreateMutex()
+{
+       return new Win32Mutex(this->ServerInstance);
+}
+
+Win32Mutex::Win32Mutex(InspIRCd* Instance) : Mutex(Instance)
+{
+       InitializeCriticalSection(&wutex);
+}
+
+Win32Mutex::~Win32Mutex()
+{
+       DeleteCriticalSection(&wutex);
+}
+
+void Win32Mutex::Enable(bool enable)
+{
+       if (enable)
+               EnterCriticalSection(&wutex);
+       else
+               LeaveCriticalSection(&wutex);
+}
\ No newline at end of file