Make the Thread state machine more strict

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

diff --git a/source/core/thread.h b/source/core/thread.h
index 2b0766c68ba7fbd0d443265d30d58628ddda76f8..81494eaf5e47a007d6bd6207293a972920277362 100644 (file)
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,12 +1,5 @@
-/*
-This file is part of libmspframework
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-#ifndef MSP_FRAMEWORK_THREAD_H_
-#define MSP_FRAMEWORK_THREAD_H_
-
-#include "types.h"
+#ifndef MSP_CORE_THREAD_H_
+#define MSP_CORE_THREAD_H_
 
 namespace Msp {
 
@@ -19,30 +12,45 @@ is started.
 */
 class Thread
 {
+private:
+       struct Private;
+
+       enum State
+       {
+               PENDING,
+               RUNNING,
+               FINISHED,
+               KILLED,
+               JOINED
+       };
+
+       Private *priv_;
+       State state_;
+
+protected:
+       Thread();
+private:
+       Thread(const Thread &);
+       Thread &operator=(const Thread &);
 public:
+       virtual ~Thread();
+
+       /** Indicates whether the thread has finished running. */
+       bool is_finished() { return state_>=FINISHED; }
+
+       /** Waits for the thread to exit.  Calling this from the thread will cause a
+       deadlock. */
        void join();
-       void cancel();
+
+       /** Violently terminates the thread.  This should only be used as a last
+       resort, as the thread gets no chance to clean up. */
        void kill();
-       virtual ~Thread();
+
 protected:
-       Thread(): launched_(false) { }
+       /** Starts the thread.  Can only be called once for each Thread instance. */
        void launch();
-       virtual void main()=0;
-       void check_cancel();
-private:
-       ThreadHandle thread_;
-       bool         launched_;
 
-       Thread(const Thread &);
-       Thread &operator=(const Thread &);
-
-#ifdef WIN32
-#      define THREAD_RETURN_ DWORD WINAPI
-#else
-#      define THREAD_RETURN_ void *
-#endif
-       static THREAD_RETURN_ main_(void *t) { ((Thread *)t)->main(); return 0; }
-#undef THREAD_RETURN_
+       virtual void main() = 0;
 };
 
 } // namespace Msp