updated threadpool

tsung-wei-huang · tsung-wei-huang · commit ec6b79a02896 · 2018-09-13T19:00:57.000-05:00
diff --git a/example/threadpool.cpp b/example/threadpool.cpp
@@ -24,7 +24,7 @@ auto linear_insertions() {
   std::atomic<size_t> sum {0};
 
   std::function<void(int)> insert;
-  std::promise<void> promise;
+  std::promise<int> promise;
   auto future = promise.get_future();
   
   insert = [&threadpool, &insert, &sum, &promise] (int i) {
@@ -35,7 +35,7 @@ auto linear_insertions() {
     }
     else {
       if(auto s = ++sum; s == threadpool.num_workers()) {
-        promise.set_value();
+        promise.set_value(1);
       }
     }
   };
@@ -45,7 +45,10 @@ auto linear_insertions() {
   }
 
   // synchronize until all tasks finish
-  future.get();
+  threadpool.wait_for_all();
+  
+  assert(future.wait_for(std::chrono::seconds(0)) == std::future_status::ready);
+  assert(future.get() == 1); 
   assert(sum == num_threads);
   
   auto end = std::chrono::high_resolution_clock::now();

Original file line number	Diff line number	Diff line change
`@@ -24,7 +24,7 @@ auto linear_insertions() {`
`24`	`24`	`std::atomic<size_t> sum {0};`
`25`	`25`
`26`	`26`	`std::function<void(int)> insert;`
`27`		`- std::promise<void> promise;`
	`27`	`+ std::promise<int> promise;`
`28`	`28`	`auto future = promise.get_future();`
`29`	`29`
`30`	`30`	`insert = [&threadpool, &insert, &sum, &promise] (int i) {`
`@@ -35,7 +35,7 @@ auto linear_insertions() {`
`35`	`35`	`}`
`36`	`36`	`else {`
`37`	`37`	`if(auto s = ++sum; s == threadpool.num_workers()) {`
`38`		`- promise.set_value();`
	`38`	`+ promise.set_value(1);`
`39`	`39`	`}`
`40`	`40`	`}`
`41`	`41`	`};`
`@@ -45,7 +45,10 @@ auto linear_insertions() {`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`// synchronize until all tasks finish`
`48`		`- future.get();`
	`48`	`+ threadpool.wait_for_all();`
	`49`	`+`
	`50`	`+ assert(future.wait_for(std::chrono::seconds(0)) == std::future_status::ready);`
	`51`	`+ assert(future.get() == 1);`
`49`	`52`	`assert(sum == num_threads);`
`50`	`53`
`51`	`54`	`auto end = std::chrono::high_resolution_clock::now();`