*thread

1 files changed, 44 insertions, 8 deletions

diff --git a/source/libs/asura-lib-utils/threading/thread.h b/source/libs/asura-lib-utils/threading/thread.h
index 1bd5f15..3fa079a 100644
--- a/source/libs/asura-lib-utils/threading/thread.h
+++ b/source/libs/asura-lib-utils/threading/thread.h
@@ -17,6 +17,28 @@ namespace AsuraEngine
 		class ThreadImpl;
 
 		///
+		/// �̵߳ļ��ֲ�ͬ��ʵ�֣�
+		///     1: Deferred���ӳ�ģʽ�����߳��ϵ�������ɺ���Ҫ�ֶ������̵߳���Post������
+		///        �����̵߳��ص����������������첽��Ϊͬ�������������lua_State��ͻ�����⡣
+		///     2: Immediate������ģʽ����ÿһ���߳�ά��һ��lua_newthread����������lua_State��
+		///        �ص������ڲ�ͬ��lua_State�е��ã����ⲻͬ���̷߳���ͬһ��lua_State��
+		///     3: Daemon���ػ�ģʽ�����̻߳�һֱ�����ں�̨��
+		///
+		enum ThreadType
+		{
+			THREAD_TYPE_DEFERRED,
+			THREAD_TYPE_IMMEDIATE,
+			THREAD_TYPE_DAEMON
+		};
+
+		enum ThreadState
+		{
+			THREAD_STATE_RUNNING,
+			THREAD_STATE_DEAD,
+			THREAD_STATE_SUSPEND,
+		};
+
+		///
 		/// �߳����壬ÿ���߳�ά��һ��task queue��
 		///
 		class Thread ASURA_FINAL
@@ -26,7 +48,7 @@ namespace AsuraEngine
 
 			LUAX_DECL_FACTORY(Thread);
 
-			Thread(Luax::LuaxState& father, const std::string& name = "");
+			Thread(ThreadType type, Luax::LuaxState& luaThread, const std::string& name = "");
 			~Thread();
 
 			bool AddTask(Task* task);
@@ -34,8 +56,10 @@ namespace AsuraEngine
 			void Start(uint32 stacksize = 0);
 
 			///
-			/// ǿ����ֹ�̡߳�ע��Ҫ������new��delete֮��ִ��TerminateThread��������򽫲����ڼ���ʹ��new�ˡ�
+			/// ǿ����ֹ�̡߳�ע��Ҫ������new��delete֮��ִ��TerminateThread��������򽫲����ڼ�
+			/// ��ʹ��new�ˡ�
 			/// https://blog.csdn.net/anye3000/article/details/7470674
+			/// ע�⣺������Ҫʹ������ӿڣ�Ӧ�����߳��Լ����е��յ㣬�������ֶ��ر�����
 			///
 			void Kill();
 
@@ -51,12 +75,21 @@ namespace AsuraEngine
 			///
 			/// ִ��������С�
 			///
-			void Execute();
+			void Process();
 
 			const std::string& GetName();
 
+			///
+			/// �ص���
+			///
+			void Post();
+
 		private:
 
+			//----------------------------------------------------------------------------//
+
+			LUAX_DECL_ENUM(ThreadType);
+
 			LUAX_DECL_METHOD(_New);
 			LUAX_DECL_METHOD(_Start);
 			LUAX_DECL_METHOD(_Join);
@@ -65,6 +98,10 @@ namespace AsuraEngine
 			LUAX_DECL_METHOD(_IsRunning);
 			LUAX_DECL_METHOD(_IsCurrent);
 			LUAX_DECL_METHOD(_GetName);
+			LUAX_DECL_METHOD(_Sleep);
+			LUAX_DECL_METHOD(_Post);
+
+			//----------------------------------------------------------------------------//
 
 			ThreadImpl* mImpl;
 			std::string mName;
@@ -75,11 +112,10 @@ namespace AsuraEngine
 			std::queue<Task*> mTaskQueue;
 			Mutex             mMutex;
 
-			///
-			/// ���̵߳�luaִ��ջ��Ϊ�˱������ִ��ջ��ͻ
-			///
-			lua_State*          mState;
-			Luax::LuaxMemberRef mStateRef;
+			lua_State*        mLuaThread;
+
+			std::queue<Task*> mFinishedTasks;
+			Mutex             mFinishedMutex;
 
 		};