Merge bitcoin#8016: Fix multithread CScheduler and reenable test

166e4b0 Notify other serviceQueue thread we are finished to prevent deadlocks. (Pavel Janík) db18ab2 Reenable multithread scheduler test. (Pavel Janík)
curtiszimmerman · May 10, 2016 · 5767e80 · 5767e80
2 parents b33824b + 166e4b0
commit 5767e80
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/src/scheduler.cpp b/src/scheduler.cpp
@@ -79,6 +79,7 @@ void CScheduler::serviceQueue()
         }
     }
     --nThreadsServicingQueue;
+    newTaskScheduled.notify_one();
 }
 
 void CScheduler::stop(bool drain)

diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp
@@ -40,7 +40,6 @@ static void MicroSleep(uint64_t n)
 #endif
 }
 
-#if 0 /* Disabled for now because there is a race condition issue in this test - see #6540 */
 BOOST_AUTO_TEST_CASE(manythreads)
 {
     seed_insecure_rand(false);
@@ -116,6 +115,5 @@ BOOST_AUTO_TEST_CASE(manythreads)
     }
     BOOST_CHECK_EQUAL(counterSum, 200);
 }
-#endif
 
 BOOST_AUTO_TEST_SUITE_END()