Refactoring

czchen · czchen · commit 233c599389d3 · 2010-09-24T20:14:35.000+08:00
diff --git a/main.cpp b/main.cpp
@@ -64,7 +64,7 @@ int main(int argc, char **argv)
 	for(unsigned int i=0;i<ITERATIONS;i++){
 		SampleWorkerThread* myThread = new SampleWorkerThread(i);
 //cout << "myThread[" << myThread->id << "] = [" << myThread << "]" << endl;
-		myPool->assignWork(myThread);
+		myPool->assign_work(myThread);
 	}
 
 	// destroy_pool(int maxPollSecs)
diff --git a/threadpool.cpp b/threadpool.cpp
@@ -73,11 +73,11 @@ void ThreadPool::destroy_pool(int maxPollSecs = 2)
 }
 
 
-bool ThreadPool::assignWork(WorkerThread *workerThread)
+bool ThreadPool::assign_work(WorkerThread *workerThread)
 {
 	pthread_mutex_lock(&mutexWorkCompletion);
 	_incomplete_work++;
-	//cout << "assignWork...incomapleteWork=" << _incomplete_work << endl;
+	//cout << "assign_work...incomapleteWork=" << _incomplete_work << endl;
 	pthread_mutex_unlock(&mutexWorkCompletion);
 
 	sem_wait(&_available_thread);
diff --git a/threadpool.h b/threadpool.h
@@ -48,7 +48,7 @@ class ThreadPool{
 
 	void destroy_pool(int maxPollSecs);
 
-	bool assignWork(WorkerThread *worker);
+	bool assign_work(WorkerThread *worker);
 	bool fetchWork(WorkerThread **worker);
 
 	void initializeThreads();

Original file line number	Diff line number	Diff line change
`@@ -64,7 +64,7 @@ int main(int argc, char **argv)`
`64`	`64`	`for(unsigned int i=0;i<ITERATIONS;i++){`
`65`	`65`	`SampleWorkerThread* myThread = new SampleWorkerThread(i);`
`66`	`66`	`//cout << "myThread[" << myThread->id << "] = [" << myThread << "]" << endl;`
`67`		`- myPool->assignWork(myThread);`
	`67`	`+ myPool->assign_work(myThread);`
`68`	`68`	`}`
`69`	`69`
`70`	`70`	`// destroy_pool(int maxPollSecs)`
Original file line number	Diff line number	Diff line change
`@@ -73,11 +73,11 @@ void ThreadPool::destroy_pool(int maxPollSecs = 2)`
`73`	`73`	`}`
`74`	`74`
`75`	`75`
`76`		`-bool ThreadPool::assignWork(WorkerThread *workerThread)`
	`76`	`+bool ThreadPool::assign_work(WorkerThread *workerThread)`
`77`	`77`	`{`
`78`	`78`	`pthread_mutex_lock(&mutexWorkCompletion);`
`79`	`79`	`_incomplete_work++;`
`80`		`- //cout << "assignWork...incomapleteWork=" << _incomplete_work << endl;`
	`80`	`+ //cout << "assign_work...incomapleteWork=" << _incomplete_work << endl;`
`81`	`81`	`pthread_mutex_unlock(&mutexWorkCompletion);`
`82`	`82`
`83`	`83`	`sem_wait(&_available_thread);`