Move notify worker to outside lock

clin99 · web-flow · commit 9b37d5fa556f · 2018-09-21T12:26:12.000-05:00
diff --git a/taskflow/threadpool/privatized_threadpool.hpp b/taskflow/threadpool/privatized_threadpool.hpp
@@ -677,6 +677,7 @@ void BasicPrivatizedThreadpool<Func>::wait_for_all() {
   
 /* A different implementation
 
+
 template < template<typename...> class Func >
 class BasicPrivatizedThreadpool {
 
@@ -1036,13 +1037,12 @@ void BasicPrivatizedThreadpool<Func>::silent_async(C&& c){
   if(!_workers[id]->queue.push_back(t)){
     std::scoped_lock<std::mutex> lock(_mutex);
     _task_queue.push_back(std::move(t));
-    _workers[id]->cv.notify_one();
   }
   else{
     // Lock to make sure the worker will be notified
     std::scoped_lock<std::mutex> lock(_mutex);
-    _workers[id]->cv.notify_one();
   }
+  _workers[id]->cv.notify_one();
 }
 
 
@@ -1073,6 +1073,7 @@ void BasicPrivatizedThreadpool<Func>::wait_for_all() {
     _empty_cv.wait(lock);
   }
 }
+
 */ 
   
 

Original file line number	Diff line number	Diff line change
`@@ -677,6 +677,7 @@ void BasicPrivatizedThreadpool<Func>::wait_for_all() {`
`677`	`677`
`678`	`678`	`/* A different implementation`
`679`	`679`
	`680`	`+`
`680`	`681`	`template < template<typename...> class Func >`
`681`	`682`	`class BasicPrivatizedThreadpool {`
`682`	`683`
`@@ -1036,13 +1037,12 @@ void BasicPrivatizedThreadpool<Func>::silent_async(C&& c){`
`1036`	`1037`	`if(!_workers[id]->queue.push_back(t)){`
`1037`	`1038`	`std::scoped_lock<std::mutex> lock(_mutex);`
`1038`	`1039`	`_task_queue.push_back(std::move(t));`
`1039`		`- _workers[id]->cv.notify_one();`
`1040`	`1040`	`}`
`1041`	`1041`	`else{`
`1042`	`1042`	`// Lock to make sure the worker will be notified`
`1043`	`1043`	`std::scoped_lock<std::mutex> lock(_mutex);`
`1044`		`- _workers[id]->cv.notify_one();`
`1045`	`1044`	`}`
	`1045`	`+ _workers[id]->cv.notify_one();`
`1046`	`1046`	`}`
`1047`	`1047`
`1048`	`1048`
`@@ -1073,6 +1073,7 @@ void BasicPrivatizedThreadpool<Func>::wait_for_all() {`
`1073`	`1073`	`_empty_cv.wait(lock);`
`1074`	`1074`	`}`
`1075`	`1075`	`}`
	`1076`	`+`
`1076`	`1077`	`*/`
`1077`	`1078`
`1078`	`1079`