X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Fcore%2Fthread.h;h=c84fb668a7c494ca47fa965e46ceb587866a0162;hb=03862ac4f38db0799872850dc4ab43b88688e4eb;hp=81494eaf5e47a007d6bd6207293a972920277362;hpb=a23176e6d3399bbeb75cf6a173543bf5d5f85187;p=libs%2Fcore.git

diff --git a/source/core/thread.h b/source/core/thread.h
index 81494ea..c84fb66 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,7 +13,7 @@ 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;
@@ -24,17 +27,17 @@ private:
 		JOINED
 	};
 
-	Private *priv_;
-	State state_;
+	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; }
 
@@ -50,6 +53,13 @@ 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;
 };