From 69f7d1bd745ed5680b9bc4e3cfdd882ff2a5ad26 Mon Sep 17 00:00:00 2001
From: chai <chaifix@163.com>
Date: Wed, 27 Mar 2019 22:18:14 +0800
Subject: +threading

---
 source/libs/asura-lib-utils/threading/thread.h | 58 +++++++++++++++++++++++---
 1 file changed, 52 insertions(+), 6 deletions(-)

(limited to 'source/libs/asura-lib-utils/threading/thread.h')

diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/libs/asura-lib-utils/threading/thread.h
index 0058144..24b549c 100644
--- a/source/libs/asura-lib-utils/threading/thread.h
+++ b/source/libs/asura-lib-utils/threading/thread.h
@@ -1,10 +1,13 @@
 #ifndef __ASURA_THREAD_H__
 #define __ASURA_THREAD_H__
 
+#include <string>
 #include <queue>
+
 #include <asura-lib-utils/scripting/portable.hpp>
 
 #include "thread_task.h"
+#include "mutex.h"
 
 namespace AsuraEngine
 {
@@ -23,21 +26,55 @@ namespace AsuraEngine
 
 			LUAX_DECL_FACTORY(Thread);
 
-			bool Enqueue(ThreadTask* task);
+			Thread(const std::string& name = "");
+			~Thread();
+
+			bool AddTask(ThreadTask* task);
+
+			void Start(uint32 stacksize = 0);
+
+			///
+			/// 强制终止线程。注意要避免在new和delete之间执行TerminateThread，否则程序将不能在继续使用new了。
+			/// https://blog.csdn.net/anye3000/article/details/7470674
+			///
+			void Kill();
+
+			///
+			/// 父线程等待本线程结束后才继续执行。
+			///
+			void Join();
+
+			bool IsRunning();
 
-			void Run();
+			bool IsCurrent();
+
+			///
+			/// 执行任务队列。
+			///
+			void Execute();
+
+			const std::string& GetName();
 
 		private:
 
+			LUAX_DECL_METHOD(_New);
+			LUAX_DECL_METHOD(_Start);
+			LUAX_DECL_METHOD(_Join);
+			LUAX_DECL_METHOD(_Kill);
+			LUAX_DECL_METHOD(_AddTask);
+			LUAX_DECL_METHOD(_IsRunning);
+			LUAX_DECL_METHOD(_IsCurrent);
+			LUAX_DECL_METHOD(_GetName);
+
 			///
-			/// 任务队列。
+			/// 待处理的任务队列。
 			///
 			std::queue<ThreadTask*> mTaskQueue;
 
-			ThreadImpl* mImpl;
+			Mutex mMutex;
 
-			LUAX_DECL_METHOD(_Enqueue);
-			LUAX_DECL_METHOD(_Run);
+			ThreadImpl* mImpl;
+			std::string mName;
 
 		};
 
@@ -51,6 +88,15 @@ namespace AsuraEngine
 		ASURA_ABSTRACT class ThreadImpl
 		{
 		public:
+			ThreadImpl() {};
+			virtual ~ThreadImpl() {};
+
+			virtual bool Start(Thread* thread, uint32 stacksize = 0) = 0;
+			virtual void Join() = 0;
+			virtual void Kill() = 0;
+
+			virtual bool IsRunning() = 0;
+			virtual bool IsCurrent() = 0;
 
 		};
 
-- 
cgit v1.1-26-g67d0