111

Author: bigwudan

.ThreadPool.cpp.swo

@@ -57,20 +57,14 @@ void *ThreadPool::thr_fn(void *arg)
 
 	ThreadPool *pool = work_thr->thread_pool;
 
-	std::cout<< "id=" << (work_thr->id) <<"; thread_id="<<work_thr->thread_id << std::endl;
+	//std::cout<< "id=" << (work_thr->id) <<"; thread_id="<<work_thr->thread_id << std::endl;
 
 	while(work_thr->thread_state == WorkThread::WorkState )
 	{
 		pthread_mutex_lock(&pool->lock);	
 		pthread_cond_wait( &pool->queue_not_empty, &pool->lock);
-		std::list<ThreadTask*>::iterator it1;
-		it1 = (pool->thread_task).erase((pool->thread_task).begin());
-		
-		ThreadTask *p_task = *it1;
-		p_task->thread_task_id;
-
-		std::cout << "work thread_id=" << p_task->thread_task_id  <<std::endl;
-
+		std::cout << (*((pool->thread_task).begin()))->thread_task_id<< std::endl;
+		(pool->thread_task).erase((pool->thread_task).begin());
 		pthread_mutex_unlock(&pool->lock);	
 	}
 	return NULL;
@@ -80,7 +74,8 @@ int ThreadPool::add_task(ThreadTask &task)
 {
 	pthread_mutex_lock(&lock);
 	thread_task.push_back(&task);
-	pthread_cond_signal(&queue_not_empty);
+	int flag=pthread_cond_signal(&queue_not_empty);
+	std::cout << "flag:" << flag<< std::endl;
 	pthread_mutex_unlock(&lock);
 }
 

.ThreadPool.cpp.swp

@@ -12,8 +12,8 @@ StopState	WorkThread.h	/^		StopState$/;"	e	enum:threadpool::WorkThread::work_sta
 ThreadInit	ThreadPool.cpp	/^int ThreadPool::ThreadInit()$/;"	f	class:ThreadPool
 ThreadPool	ThreadPool.cpp	/^ThreadPool::ThreadPool(int min_num, int max_num):$/;"	f	class:ThreadPool
 ThreadPool	ThreadPool.h	/^class ThreadPool$/;"	c	namespace:threadpool
-ThreadTask	ThreadTask.h	/^class ThreadTask$/;"	c	namespace:ThreadTask
-ThreadTask	ThreadTask.h	/^namespace ThreadTask$/;"	n
+ThreadTask	ThreadTask.h	/^	ThreadTask(int id):thread_task_id(id)$/;"	f	class:threadpool::ThreadTask
+ThreadTask	ThreadTask.h	/^class ThreadTask$/;"	c	namespace:threadpool
 WorkState	WorkThread.h	/^		WorkState,$/;"	e	enum:threadpool::WorkThread::work_state
 WorkThread	WorkThread.h	/^	WorkThread():thread_id(0),thread_state(WorkState),thread_pool(NULL){$/;"	f	class:threadpool::WorkThread
 WorkThread	WorkThread.h	/^class WorkThread$/;"	c	namespace:threadpool
@@ -23,7 +23,6 @@ _WORKTHREAD_H_	WorkThread.h	3;"	d
 _test_h	test.h	2;"	d
 add_task	ThreadPool.cpp	/^int ThreadPool::add_task(ThreadTask &task)$/;"	f	class:ThreadPool
 busy_thr_num	ThreadPool.h	/^	int busy_thr_num;$/;"	m	class:threadpool::ThreadPool
-flag	ThreadTask.h	/^	int flag;$/;"	m	class:ThreadTask::ThreadTask
 id	WorkThread.h	/^	int id;$/;"	m	class:threadpool::WorkThread
 live_thr_num	ThreadPool.h	/^	int live_thr_num;$/;"	m	class:threadpool::ThreadPool
 lock	ThreadPool.h	/^	pthread_mutex_t lock; \/\/本结构$/;"	m	class:threadpool::ThreadPool
@@ -44,11 +43,12 @@ thread_counter	ThreadPool.h	/^	pthread_mutex_t thread_counter; \/\/记录忙状
 thread_id	WorkThread.h	/^	pthread_t thread_id;$/;"	m	class:threadpool::WorkThread
 thread_pool	WorkThread.h	/^	ThreadPool *thread_pool;$/;"	m	class:threadpool::WorkThread
 thread_state	WorkThread.h	/^	work_state thread_state;	$/;"	m	class:threadpool::WorkThread
-thread_task_id	ThreadTask.h	/^	int thread_task_id;$/;"	m	class:ThreadTask::ThreadTask
+thread_task	ThreadPool.h	/^	std::list<ThreadTask*> thread_task;$/;"	m	class:threadpool::ThreadPool
+thread_task_id	ThreadTask.h	/^	int thread_task_id;$/;"	m	class:threadpool::ThreadTask
 threadpool	ThreadPool.h	/^namespace threadpool$/;"	n
+threadpool	ThreadTask.h	/^namespace threadpool$/;"	n
 threadpool	WorkThread.h	/^namespace threadpool$/;"	n
 threadpool_state	ThreadPool.h	/^enum threadpool_state{ On, Off };$/;"	g	class:threadpool::ThreadPool
-tm	ThreadPool.h	/^	ThreadTask tm;$/;"	m	class:threadpool::ThreadPool
 wait_exit_thr_num	ThreadPool.h	/^	int wait_exit_thr_num;$/;"	m	class:threadpool::ThreadPool
 work_state	WorkThread.h	/^	enum work_state{$/;"	g	class:threadpool::WorkThread
 work_thread	ThreadPool.h	/^	std::list<WorkThread*> work_thread;$/;"	m	class:threadpool::ThreadPool

.ThreadTask.h.swp

@@ -15,15 +15,20 @@ int main()
 	thread_pool.ThreadInit();
 
 	threadpool::ThreadTask t1(1);
+
+	t1.thread_task_id = 10;
+
 	threadpool::ThreadTask t2(2);
+	
+	sleep(3);
 
 	thread_pool.add_task(t1);
 
-	thread_pool.add_task(t2);
+//	thread_pool.add_task(t2);
 
 
 
-	sleep(5);
+	sleep(10);