X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=ae9a0dda832b716445ad81b9493b8a7c24ca6778;hb=5763dd6e8089c97699cbcbd221afb7fe1841bcdd;hp=ae257078569c47844e0d4502886f5de403371885;hpb=c7afef88380ebebc8c2b04e48664d73281ec8848;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index ae25707..ae9a0dd 100644
--- 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;
 
-	Private *priv_;
-	bool launched_;
+	enum State
+	{
+		PENDING,
+		RUNNING,
+		FINISHED,
+		KILLED,
+		JOINED
+	};
+
+	Private *_priv = 0;
+	std::string _name;
+	State _state = PENDING;
 
 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;
 };