Refactoring

czchen · czchen · commit dc033bbbade3 · 2010-09-24T17:34:25.000+08:00
diff --git a/threadpool.cpp b/threadpool.cpp
@@ -25,24 +25,12 @@ pthread_mutex_t ThreadPool::mutexSync = PTHREAD_MUTEX_INITIALIZER;
 pthread_mutex_t ThreadPool::mutexWorkCompletion = PTHREAD_MUTEX_INITIALIZER;
 
 
-
-ThreadPool::ThreadPool()
-{
-	ThreadPool(2);
-}
-
-ThreadPool::ThreadPool(int maxThreads)
+ThreadPool::ThreadPool(unsigned int num_thread)
+:_num_thread(num_thread)
+,workerQueue(num_thread, NULL)
+,queueSize(num_thread)
 {
-	if (maxThreads < 1)  maxThreads=1;
-
-	//mutexSync = PTHREAD_MUTEX_INITIALIZER;
-	//mutexWorkCompletion = PTHREAD_MUTEX_INITIALIZER;
-
 	pthread_mutex_lock(&mutexSync);
-	this->maxThreads = maxThreads;
-	this->queueSize = maxThreads;
-	//workerQueue = new WorkerThread *[maxThreads];
-	workerQueue.resize(maxThreads, NULL);
 	topIndex = 0;
 	bottomIndex = 0;
 	incompleteWork = 0;
@@ -53,7 +41,7 @@ ThreadPool::ThreadPool(int maxThreads)
 
 void ThreadPool::initializeThreads()
 {
-	for(int i = 0; i<maxThreads; ++i)
+	for (unsigned int i = 0; i < _num_thread; ++i)
 	{
 		pthread_t tempThread;
 		pthread_create(&tempThread, NULL, &ThreadPool::threadExecute, (void *) this );
diff --git a/threadpool.h b/threadpool.h
@@ -43,8 +43,7 @@ ThreadPool class manages all the ThreadPool related activities. This includes ke
 */
 class ThreadPool{
 public:
-	ThreadPool();
-	ThreadPool(int maxThreadsTemp);
+	explicit ThreadPool(unsigned int num_thread);
 	virtual ~ThreadPool();
 
 	void destroyPool(int maxPollSecs);
@@ -61,7 +60,7 @@ class ThreadPool{
 
 
 private:
-	int maxThreads;
+	unsigned int _num_thread;
 
 	pthread_cond_t  condCrit;
 	sem_t availableWork;
