refactored simple_threadpool

tsung-wei-huang · tsung-wei-huang · commit 5ca980bc0e26 · 2018-09-13T18:51:21.000-05:00
added unittest for simple_threadpool
diff --git a/example/taskflow_subsum.cpp b/example/taskflow_subsum.cpp
@@ -72,6 +72,7 @@ void maxSubArraySum(std::vector<int>& vec, int l, int r, std::atomic<int>& max_n
 
 // Function: main
 int main(int argc, char* argv[]) {
+
   ::srand(1);
 
   std::vector<int> vec(total, 0);
diff --git a/taskflow/threadpool/simple_threadpool.hpp b/taskflow/threadpool/simple_threadpool.hpp
@@ -232,39 +232,6 @@ auto SimpleThreadpool::async(C&& c, Signal sig) {
 }
 
 // Procedure: wait_for_all
-// After this method returns, all previously-scheduled tasks in the pool
-// will have been executed.
-//inline void SimpleThreadpool::wait_for_all() {
-//  
-//  if(is_worker()) {
-//    throw std::runtime_error("Worker thread cannot wait for all");
-//  }
-//
-//  std::mutex barrier_mutex;
-//  std::condition_variable barrier_cv;
-//  auto threads_to_sync{_threads.size()};
-//  std::vector<std::future<void>> futures;
-//
-//  for(size_t i=0; i<_threads.size(); ++i) {
-//    futures.emplace_back(async([&] () {
-//      std::unique_lock<std::mutex> lock(barrier_mutex);
-//      if (--threads_to_sync; threads_to_sync == 0) {
-//        barrier_cv.notify_all();
-//      }
-//      else {
-//        barrier_cv.wait(lock, [&threads_to_sync] {
-//          return threads_to_sync == 0;
-//        });
-//      }
-//    }));
-//  }
-//
-//  // Wait for all threads to have finished synchronization
-//  for (auto& fu : futures) {
-//    fu.get();
-//  }
-//}
-
 inline void SimpleThreadpool::wait_for_all(){
 
   if(is_worker()) {
@@ -275,7 +242,6 @@ inline void SimpleThreadpool::wait_for_all(){
   _wait_for_all = true;
   _complete.wait(lock, [this](){ return _idle_workers == num_workers() && _task_queue.size() == 0; });
   _wait_for_all = false;
-
 }
 
 // Procedure: shutdown
diff --git a/unittest/threadpool.cpp b/unittest/threadpool.cpp
@@ -229,6 +229,13 @@ void test_dynamic_tasking(T& threadpool) {
 TEST_CASE("SimpleThreadpool" * doctest::timeout(300)) {
 
   const size_t num_tasks = 100;
+  
+  //SUBCASE("Ownership") {
+  //  for(unsigned i=0; i<=4; ++i) {
+  //    tf::SimpleThreadpool tp(i);
+  //    test_ownership(tp);
+  //  }
+  //}
 
   SUBCASE("PlaceTask"){
     for(unsigned i=0; i<=4; ++i) {
@@ -244,6 +251,20 @@ TEST_CASE("SimpleThreadpool" * doctest::timeout(300)) {
       test_wait_for_all(tp);
     }
   }
+  
+  SUBCASE("SpawnShutdown") {
+    for(unsigned i=0; i<=4; ++i) {
+      tf::SimpleThreadpool tp(i);
+      test_spawn_shutdown(tp);
+    }
+  }
+
+  SUBCASE("DynamicTasking") {
+    for(unsigned i=0; i<=4; ++i) {
+      tf::SimpleThreadpool tp(i);
+      test_dynamic_tasking(tp);
+    }
+  }
 }
 
 // --------------------------------------------------------
