Refactoring

czchen · czchen · commit 078d6021f4c2 · 2010-09-24T20:13:47.000+08:00
diff --git a/main.cpp b/main.cpp
@@ -67,13 +67,13 @@ int main(int argc, char **argv)
 		myPool->assignWork(myThread);
 	}
 
-	// destroyPool(int maxPollSecs)
+	// destroy_pool(int maxPollSecs)
 	// Before actually destroying the ThreadPool, this function checks if all the pending work is completed.
 	// If the work is still not done, then it will check again after maxPollSecs
 	// The default value for maxPollSecs is 2 seconds.
 	// And ofcourse the user is supposed to adjust it for his needs.
 
-	myPool->destroyPool(2);
+	myPool->destroy_pool(2);
 
 	time_t t2=time(NULL);
 	cout << t2-t1 << " seconds elapsed\n" << endl;
diff --git a/threadpool.cpp b/threadpool.cpp
@@ -57,7 +57,7 @@ ThreadPool::~ThreadPool()
 
 
 
-void ThreadPool::destroyPool(int maxPollSecs = 2)
+void ThreadPool::destroy_pool(int maxPollSecs = 2)
 {
 	while( _incomplete_work>0 )
 	{
diff --git a/threadpool.h b/threadpool.h
@@ -46,7 +46,7 @@ class ThreadPool{
 	explicit ThreadPool(unsigned int num_thread);
 	virtual ~ThreadPool();
 
-	void destroyPool(int maxPollSecs);
+	void destroy_pool(int maxPollSecs);
 
 	bool assignWork(WorkerThread *worker);
 	bool fetchWork(WorkerThread **worker);

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ ThreadPool::~ThreadPool()`
`57`	`57`
`58`	`58`
`59`	`59`
`60`		`-void ThreadPool::destroyPool(int maxPollSecs = 2)`
	`60`	`+void ThreadPool::destroy_pool(int maxPollSecs = 2)`
`61`	`61`	`{`
`62`	`62`	`while( _incomplete_work>0 )`
`63`	`63`	`{`