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 ae257078569c47844e0d4502886f5de403371885..6a17912fdc3c03e0d0904aeb768b8a40ee316212 100644 (file)
--- a/source/core/thread.h
+++ b/source/core/thread.h
@@ -1,6 +1,9 @@
 #ifndef MSP_CORE_THREAD_H_
 #define MSP_CORE_THREAD_H_
 
+#include <string>
+#include "noncopyable.h"
+
 namespace Msp {
 
 /**
@@ -10,22 +13,34 @@ 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_;
-       bool launched_;
+       std::string name_;
+       State state_;
 
 protected:
-       Thread();
-private:
-       Thread(const Thread &);
-       Thread &operator=(const Thread &);
+       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();
@@ -33,8 +48,18 @@ public:
        /** Violently terminates the thread.  This should only be used as a last
        resort, as the thread gets no chance to clean up. */
        void kill();
+
 protected:
+       /** Starts the thread.  Can only be called once for each Thread instance. */
        void launch();
+
+private:
+       void platform_join();
+       void platform_kill();
+       void platform_launch();
+       void platform_setname();
+
+protected:
        virtual void main() = 0;
 };