增强线程调试。

kbengine · kbengine · commit 2d96dca3d65f · 2014-08-13T11:51:48.000+08:00
diff --git a/kbe/src/lib/thread/threadpool.cpp b/kbe/src/lib/thread/threadpool.cpp
@@ -116,8 +116,6 @@ currentFreeThreadCount_(0),
 normalThreadCount_(0),
 isDestroyed_(false)
 {		
-
-	
 	THREAD_MUTEX_INIT(threadStateList_mutex_);	
 	THREAD_MUTEX_INIT(bufferedTaskList_mutex_);
 	THREAD_MUTEX_INIT(finiTaskList_mutex_);
@@ -138,9 +136,27 @@ bool ThreadPool::initializeWatcher()
 	WATCH_OBJECT((boost::format("%1%/normalThreadCount") % name()).str().c_str(), this->normalThreadCount_);
 	WATCH_OBJECT((boost::format("%1%/bufferedTaskSize") % name()).str().c_str(), this, &ThreadPool::bufferTaskSize);
 	WATCH_OBJECT((boost::format("%1%/finiTaskSize") % name()).str().c_str(), this, &ThreadPool::finiTaskSize);
+	WATCH_OBJECT((boost::format("%1%/busyThreadStates") % name()).str().c_str(), this, &ThreadPool::printThreadWorks);
 	return true;
 }
 
+//-------------------------------------------------------------------------------------
+std::string ThreadPool::printThreadWorks()
+{
+	std::string ret;
+
+	THREAD_MUTEX_LOCK(threadStateList_mutex_);
+
+	std::list<TPThread*>::iterator itr = busyThreadList_.begin();
+	for(; itr != busyThreadList_.end(); itr++)
+	{
+		ret += (boost::format("%1%:(%2%), ") % (*itr) % (*itr)->printWorkState()).str();
+	}
+
+	THREAD_MUTEX_UNLOCK(threadStateList_mutex_);		
+	return ret;
+}
+
 //-------------------------------------------------------------------------------------
 void ThreadPool::finalise()
 {
diff --git a/kbe/src/lib/thread/threadpool.hpp b/kbe/src/lib/thread/threadpool.hpp
@@ -190,14 +190,27 @@ class TPThread
 		���ñ��߳�Ҫ����������
 	*/
 	INLINE ThreadPool* threadPool();
+
+	/**
+		����̹߳���״̬
+		��Ҫ�ṩ��watcherʹ��
+	*/
+	std::string printWorkState()
+	{
+		char buf[256];
+		lock();
+		sprintf(buf, "task=%x,state=%d", currTask_,  state_);
+		unlock();
+		return buf;
+	}
 protected:
 	THREAD_SINGNAL cond_;			// �߳��ź���
 	THREAD_MUTEX mutex_;			// �̻߳�����
-	int threadWaitSecond_;			// �߳̿���״̬��������������߳��˳��� С��0Ϊ�����߳� �뵥λ
+	int threadWaitSecond_;			// �߳̿���״̬��������������߳��˳�, С��0Ϊ�����߳�(�뵥λ)
 	TPTask * currTask_;				// ���̵߳ĵ�ǰִ�е�����
 	THREAD_ID tidp_;				// ���̵߳�ID
 	ThreadPool* threadPool_;		// �̳߳�ָ��
-	THREAD_STATE state_;			// �߳�״̬ -1��δ����, 0˯�ߣ� 1��æ��
+	THREAD_STATE state_;			// �߳�״̬: -1��δ����, 0˯��, 1��æ��
 };
 
 
@@ -214,6 +227,11 @@ class ThreadPool
 	
 	bool hasThread(TPThread* pTPThread);
 
+	/**
+		��ȡ��ǰ�̳߳������߳�״̬(�ṩ��watch��)
+	*/
+	std::string printThreadWorks();
+
 	/**
 		��ȡ��ǰ�߳�����
 	*/	

-Original file line number
+Diff line change
 		设置本线程要处理的任务
 	*/
 	INLINE ThreadPool* threadPool();
++
 +	/**
 +		输出线程工作状态
 +		主要提供给watcher使用
 +	*/
 +	std::string printWorkState()
 +	{
 +		char buf[256];
 +		lock();
 +		sprintf(buf, "task=%x,state=%d", currTask_,  state_);
 +		unlock();
 +		return buf;
 +	}
 protected:
 	THREAD_SINGNAL cond_;			// 线程信号量
 	THREAD_MUTEX mutex_;			// 线程互诉体
 -	int threadWaitSecond_;			// 线程空闲状态超过这个秒数则线程退出， 小于0为永久线程 秒单位
 +	int threadWaitSecond_;			// 线程空闲状态超过这个秒数则线程退出, 小于0为永久线程(秒单位)
 	TPTask * currTask_;				// 该线程的当前执行的任务
 	THREAD_ID tidp_;				// 本线程的ID
 	ThreadPool* threadPool_;		// 线程池指针
 -	THREAD_STATE state_;			// 线程状态 -1还未启动, 0睡眠， 1繁忙中
 +	THREAD_STATE state_;			// 线程状态: -1还未启动, 0睡眠, 1繁忙中
 };
 	bool hasThread(TPThread* pTPThread);
 +	/**
 +		获取当前线程池所有线程状态(提供给watch用)
 +	*/
 +	std::string printThreadWorks();
++
 	/**
 		获取当前线程总数
 	*/