Move most platform-specific code into overlay directories

[libs/core.git] / source / core / thread.cpp

diff --git a/source/core/thread.cpp b/source/core/thread.cpp
index 6c542e6a6712d4e19323fbd779c401abd7ea4215..d2451a0d819187e67f0ea41340720e62ac7f3a4a 100644 (file)
--- a/source/core/thread.cpp
+++ b/source/core/thread.cpp
@@ -1,41 +1,11 @@
-#ifdef WIN32
-#include <windows.h>
-#else
-#include <pthread.h>
-#include <signal.h>
-#endif
 #include <stdexcept>
 #include "thread.h"
+#include "thread_private.h"
 
 using namespace std;
 
 namespace Msp {
 
-struct Thread::Private
-{
-#ifdef WIN32
-       HANDLE handle;
-#else
-       pthread_t handle;
-#endif
-
-       Private(): handle(0) { }
-
-#ifdef WIN32
-       static DWORD WINAPI
-#else
-       static void *
-#endif
-       main_wrapper(void *a)
-       {
-               Thread *t = reinterpret_cast<Thread *>(a);
-               t->main();
-               t->state_ = FINISHED;
-               return 0;
-       }
-};
-
-
 Thread::Thread():
        priv_(new Private),
        state_(PENDING)
@@ -53,11 +23,7 @@ void Thread::join()
        if(state_>=JOINED)
                return;
 
-#ifdef WIN32
-       WaitForSingleObject(priv_->handle, INFINITE);
-#else
-       pthread_join(priv_->handle, 0);
-#endif
+       platform_join();
        state_ = JOINED;
 }
 
@@ -66,11 +32,7 @@ void Thread::kill()
        if(state_!=RUNNING)
                return;
 
-#ifdef WIN32
-       TerminateThread(priv_->handle, 0);
-#else
-       pthread_kill(priv_->handle, SIGKILL);
-#endif
+       platform_kill();
        state_ = KILLED;
 }
 
@@ -79,13 +41,16 @@ void Thread::launch()
        if(state_>=RUNNING)
                throw logic_error("already launched");
 
-#ifdef WIN32
-       DWORD dummy;  // Win9x needs the lpTthreadId parameter
-       priv_->handle = CreateThread(0, 0, &Private::main_wrapper, this, 0, &dummy);
-#else
-       pthread_create(&priv_->handle, 0, &Private::main_wrapper, this);
-#endif
+       platform_launch();
        state_ = RUNNING;
 }
 
+ThreadReturn THREAD_CALL Thread::Private::main_wrapper(void *arg)
+{
+       Thread *thread = reinterpret_cast<Thread *>(arg);
+       thread->main();
+       thread->state_ = FINISHED;
+       return 0;
+}
+
 } // namespace Msp