Make sure all classes have sensible copy semantics

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

diff --git a/source/core/thread.h b/source/core/thread.h
index ef095c6a0ce0ab8bf1a591e8714f2d469c4603f0..6a17912fdc3c03e0d0904aeb768b8a40ee316212 100644 (file)
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,13 +1,8 @@
-/* $Id$
-
-This file is part of libmspcore
-Copyright © 2006 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
 #ifndef MSP_CORE_THREAD_H_
 #define MSP_CORE_THREAD_H_
 
-#include "types.h"
+#include <string>
+#include "noncopyable.h"
 
 namespace Msp {
 
@@ -18,32 +13,54 @@ automatically started upon creation - you must manually call launch() instead.
 This is to allow initializing variables of the derived class before the thread
 is started.
 */
-class Thread
+class Thread: private NonCopyable
 {
+private:
+       struct Private;
+
+       enum State
+       {
+               PENDING,
+               RUNNING,
+               FINISHED,
+               KILLED,
+               JOINED
+       };
+
+       Private *priv_;
+       std::string name_;
+       State state_;
+
+protected:
+       Thread(const std::string & = std::string());
 public:
+       virtual ~Thread();
+
+       const std::string &get_name() const { return name_; }
+
+       /** 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 &);
+private:
+       void platform_join();
+       void platform_kill();
+       void platform_launch();
+       void platform_setname();
 
-       static
-#ifdef WIN32
-       DWORD WINAPI
-#else
-       void *
-#endif
-       main_(void *t) { (reinterpret_cast<Thread *>(t))->main(); return 0; }
+protected:
+       virtual void main() = 0;
 };
 
 } // namespace Msp