加强线程调试机制。

kbengine · kbengine · commit 4d9431de9984 · 2014-08-13T16:17:01.000+08:00
diff --git a/kbe/src/lib/thread/threadpool.cpp b/kbe/src/lib/thread/threadpool.cpp
@@ -590,7 +590,9 @@ void* TPThread::threadFunc(void* arg)
 {
 	TPThread * tptd = static_cast<TPThread*>(arg);
 	ThreadPool* pThreadPool = tptd->threadPool();
+
 	bool isRun = true;
+	tptd->reset_done_tasks();
 
 #if KBE_PLATFORM == PLATFORM_WIN32
 #else			
@@ -607,6 +609,7 @@ void* TPThread::threadFunc(void* arg)
 		}
 		else
 		{
+			tptd->reset_done_tasks();
 			isRun = tptd->onWaitCondSignal();
 		}
 
@@ -626,6 +629,7 @@ void* TPThread::threadFunc(void* arg)
 
 		while(task && !tptd->threadPool()->isDestroyed())
 		{
+			tptd->inc_done_tasks();
 			tptd->onProcessTaskStart(task);
 			tptd->processTask(task);							// ����������								
 			tptd->onProcessTaskEnd(task);
@@ -660,6 +664,7 @@ void* TPThread::threadFunc(void* arg)
 
 		tptd->onEnd();
 		tptd->state_ = THREAD_STATE_END;
+		tptd->reset_done_tasks();
 	}
 
 #if KBE_PLATFORM == PLATFORM_WIN32
diff --git a/kbe/src/lib/thread/threadpool.hpp b/kbe/src/lib/thread/threadpool.hpp
@@ -199,10 +199,17 @@ class TPThread
 	{
 		char buf[128];
 		lock();
-		sprintf(buf, "%p", currTask_);
+		sprintf(buf, "%p,%u", currTask_, done_tasks_);
 		unlock();
 		return buf;
 	}
+
+	/**
+		�߳�����һ����δ�ı䵽����״̬������ִ�е��������
+	*/
+	void reset_done_tasks(){ done_tasks_ = 0; }
+	void inc_done_tasks(){ ++done_tasks_; }
+
 protected:
 	THREAD_SINGNAL cond_;			// �߳��ź���
 	THREAD_MUTEX mutex_;			// �̻߳�����
@@ -211,6 +218,7 @@ class TPThread
 	THREAD_ID tidp_;				// ���̵߳�ID
 	ThreadPool* threadPool_;		// �̳߳�ָ��
 	THREAD_STATE state_;			// �߳�״̬: -1��δ����, 0˯��, 1��æ��
+	uint32 done_tasks_;				// �߳�����һ����δ�ı䵽����״̬������ִ�е��������
 };
 
 

Original file line number	Diff line number	Diff line change
`@@ -590,7 +590,9 @@ void* TPThread::threadFunc(void* arg)`
`590`	`590`	`{`
`591`	`591`	`TPThread * tptd = static_cast<TPThread*>(arg);`
`592`	`592`	`ThreadPool* pThreadPool = tptd->threadPool();`
	`593`	`+`
`593`	`594`	`bool isRun = true;`
	`595`	`+ tptd->reset_done_tasks();`
`594`	`596`
`595`	`597`	`#if KBE_PLATFORM == PLATFORM_WIN32`
`596`	`598`	`#else`
`@@ -607,6 +609,7 @@ void* TPThread::threadFunc(void* arg)`
`607`	`609`	`}`
`608`	`610`	`else`
`609`	`611`	`{`
	`612`	`+ tptd->reset_done_tasks();`
`610`	`613`	`isRun = tptd->onWaitCondSignal();`
`611`	`614`	`}`
`612`	`615`
`@@ -626,6 +629,7 @@ void* TPThread::threadFunc(void* arg)`
`626`	`629`
`627`	`630`	`while(task && !tptd->threadPool()->isDestroyed())`
`628`	`631`	`{`
	`632`	`+ tptd->inc_done_tasks();`
`629`	`633`	`tptd->onProcessTaskStart(task);`
`630`	`634`	`tptd->processTask(task); // 处理该任务`
`631`	`635`	`tptd->onProcessTaskEnd(task);`
`@@ -660,6 +664,7 @@ void* TPThread::threadFunc(void* arg)`
`660`	`664`
`661`	`665`	`tptd->onEnd();`
`662`	`666`	`tptd->state_ = THREAD_STATE_END;`
	`667`	`+ tptd->reset_done_tasks();`
`663`	`668`	`}`
`664`	`669`
`665`	`670`	`#if KBE_PLATFORM == PLATFORM_WIN32`
-Original file line number
+Diff line change
+	{
 		char buf[128];
 		lock();
 -		sprintf(buf, "%p", currTask_);
 +		sprintf(buf, "%p,%u", currTask_, done_tasks_);
 		unlock();
 		return buf;
+	}
++
 +	/**
 +		线程启动一次在未改变到闲置状态下连续执行的任务计数
 +	*/
 +	void reset_done_tasks(){ done_tasks_ = 0; }
 +	void inc_done_tasks(){ ++done_tasks_; }
++
 protected:
 	THREAD_SINGNAL cond_;			// 线程信号量
 	THREAD_MUTEX mutex_;			// 线程互诉体
 	THREAD_ID tidp_;				// 本线程的ID
 	ThreadPool* threadPool_;		// 线程池指针
 	THREAD_STATE state_;			// 线程状态: -1还未启动, 0睡眠, 1繁忙中
 +	uint32 done_tasks_;				// 线程启动一次在未改变到闲置状态下连续执行的任务计数
 };