X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.cpp;h=b382f067a3588868e4a0638dc577eb3059593b42;hb=d72d1b872b91a864f453fa4dc209561e6b279748;hp=a0d21875241e584614da7ed01aef0dd4ae4ae325;hpb=cfc8e0b7b15ea505bd6a6a9599cbc5ce1e316963;p=libs%2Fcore.git

diff --git a/source/core/thread.cpp b/source/core/thread.cpp
index a0d2187..b382f06 100644
--- a/source/core/thread.cpp
+++ b/source/core/thread.cpp
@@ -5,13 +5,51 @@ Copyright © 2006 Mikko Rasa, Mikkosoft Productions
 Distributed under the LGPL
 */
 
-#ifndef WIN32
+#ifdef WIN32
+#include <windows.h>
+#else
+#include <pthread.h>
 #include <signal.h>
 #endif
 #include "thread.h"
 
 namespace Msp {
 
+struct Thread::Private
+{
+#ifdef WIN32
+	HANDLE handle;
+#else
+	pthread_t handle;
+#endif
+
+	Private(): handle(0) { }
+
+#ifdef WIN32
+	static DWORD WINAPI main_wrapper(void *t)
+	{ reinterpret_cast<Thread *>(t)->main(); return 0; }
+#else
+	static void *main_wrapper(void *t)
+	{ reinterpret_cast<Thread *>(t)->main(); return 0; }
+#endif
+};
+
+
+Thread::Thread():
+	priv_(new Private),
+	launched_(false)
+{ }
+
+Thread::~Thread()
+{
+	if(launched_)
+	{
+		kill();
+		join();
+	}
+	delete priv_;
+}
+
 /**
 Waits for the thread to exit.  Calling this from the thread will cause a
 deadlock.
@@ -22,21 +60,11 @@ void Thread::join()
 		return;
 
 #ifdef WIN32
-	WaitForSingleObject(thread_, INFINITE);
+	WaitForSingleObject(priv_->handle, INFINITE);
 #else
-	pthread_join(thread_, 0);
-#endif
-	launched_=false;
-}
-
-/**
-Requests the thread to terminate gracefully.  Currently unimplemented on win32.
-*/
-void Thread::cancel()
-{
-#ifndef WIN32 //XXX
-	pthread_cancel(thread_);
+	pthread_join(priv_->handle, 0);
 #endif
+	launched_ = false;
 }
 
 /**
@@ -45,18 +73,12 @@ Violently terminates the thread.
 void Thread::kill()
 {
 #ifdef WIN32
-	TerminateThread(thread_, 0);
+	TerminateThread(priv_->handle, 0);
 #else
-	pthread_kill(thread_, SIGKILL);
+	pthread_kill(priv_->handle, SIGKILL);
 #endif
 }
 
-Thread::~Thread()
-{
-	if(launched_)
-		kill();
-}
-
 void Thread::launch()
 {
 	if(launched_)
@@ -64,11 +86,11 @@ void Thread::launch()
 
 #ifdef WIN32
 	DWORD dummy;  // Win9x needs the lpTthreadId parameter
-	thread_=CreateThread(0, 0, &main_, this, 0, &dummy);
+	priv_->handle = CreateThread(0, 0, &Private::main_wrapper, this, 0, &dummy);
 #else
-	pthread_create(&thread_, 0, &main_, this);
+	pthread_create(&priv_->handle, 0, &Private::main_wrapper, this);
 #endif
-	launched_=true;
+	launched_ = true;
 }
 
 } // namespace Msp