Create thread in constructor

czchen · czchen · commit 927cf2f3b6bb · 2010-09-24T20:37:37.000+08:00
- Create thread in constructor instead of separate function
- Add new member to store pthread_t
diff --git a/main.cpp b/main.cpp
@@ -55,7 +55,6 @@ int main(int argc, char **argv)
 	//ThreadPool(N);
 	//Create a Threadpool with N number of threads
 	ThreadPool* myPool = new ThreadPool(2);
-	myPool->initialize_thread();
 
 	//We will count time elapsed after initialize_thread()
 	time_t t1=time(NULL);
diff --git a/threadpool.cpp b/threadpool.cpp
@@ -15,7 +15,7 @@
     You should have received a copy of the GNU General Public License
     along with this program.  If not, see <http://www.gnu.org/licenses/>.
 */
-
+#include <algorithm>
 #include <stdlib.h>
 #include "threadpool.h"
 
@@ -26,7 +26,8 @@ pthread_mutex_t ThreadPool::_mutex_work_completion = PTHREAD_MUTEX_INITIALIZER;
 
 
 ThreadPool::ThreadPool(unsigned int num_thread)
-:_num_thread(num_thread)
+:_thread_pool(num_thread)
+,_num_thread(num_thread)
 ,_worker_queue(num_thread, NULL)
 ,_queue_size(num_thread)
 {
@@ -37,17 +38,10 @@ ThreadPool::ThreadPool(unsigned int num_thread)
 	sem_init(&_available_work, 0, 0);
 	sem_init(&_available_thread, 0, _queue_size);
 	pthread_mutex_unlock(&_mutex_sync);
-}
 
-void ThreadPool::initialize_thread()
-{
-	for (unsigned int i = 0; i < _num_thread; ++i)
-	{
-		pthread_t tempThread;
-		pthread_create(&tempThread, NULL, &ThreadPool::thread_execute, (void *) this );
-		//threadIdVec[i] = tempThread;
+	for (std::vector<pthread_t>::iterator i = _thread_pool.begin(); i != _thread_pool.end(); ++i) {
+		pthread_create(&*i, NULL, &ThreadPool::thread_execute, this);
 	}
-
 }
 
 ThreadPool::~ThreadPool()
diff --git a/threadpool.h b/threadpool.h
@@ -51,15 +51,14 @@ class ThreadPool{
 	bool assign_work(WorkerThread *worker);
 	bool fetch_work(WorkerThread **worker);
 
-	void initialize_thread();
-
 	static void *thread_execute(void *param);
 
 	static pthread_mutex_t _mutex_sync;
 	static pthread_mutex_t _mutex_work_completion;
 
 
 private:
+	std::vector<pthread_t> _thread_pool;
 	unsigned int _num_thread;
 
 	sem_t _available_work;
