diff options
| author | Pavel JanÃk <Pavel@Janik.cz> | 2016-05-06 11:00:01 +0200 |
|---|---|---|
| committer | MarcoFalke <falke.marco@gmail.com> | 2016-06-09 22:52:04 +0200 |
| commit | 2d2b04543d81084ec307b43fc5c4b237bef5222c (patch) | |
| tree | 8760b6b73da4d6d63a5a99391b39172905883e4c | |
| parent | 658307e8353f484f50fc3c5f2b01d903522da3b9 (diff) | |
Reenable multithread scheduler test
Github-Pull: #8016
Rebased-From: db18ab28c7a74bb289bfe6a5f9a4a9f963f71c0b 166e4b0dfa283fbdedc9a6a1e83296500c853a31
| -rw-r--r-- | src/scheduler.cpp | 1 | ||||
| -rw-r--r-- | src/test/scheduler_tests.cpp | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/scheduler.cpp b/src/scheduler.cpp index 184ddc28ab..52777b61f9 100644 --- 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 index 9acd0e2430..aa12dfbd54 100644 --- 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() |