Merge #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)
This commit is contained in:
commit
5767e80dda
2 changed files with 1 additions and 2 deletions
|
@ -79,6 +79,7 @@ void CScheduler::serviceQueue()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
--nThreadsServicingQueue;
|
--nThreadsServicingQueue;
|
||||||
|
newTaskScheduled.notify_one();
|
||||||
}
|
}
|
||||||
|
|
||||||
void CScheduler::stop(bool drain)
|
void CScheduler::stop(bool drain)
|
||||||
|
|
|
@ -40,7 +40,6 @@ static void MicroSleep(uint64_t n)
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
#if 0 /* Disabled for now because there is a race condition issue in this test - see #6540 */
|
|
||||||
BOOST_AUTO_TEST_CASE(manythreads)
|
BOOST_AUTO_TEST_CASE(manythreads)
|
||||||
{
|
{
|
||||||
seed_insecure_rand(false);
|
seed_insecure_rand(false);
|
||||||
|
@ -116,6 +115,5 @@ BOOST_AUTO_TEST_CASE(manythreads)
|
||||||
}
|
}
|
||||||
BOOST_CHECK_EQUAL(counterSum, 200);
|
BOOST_CHECK_EQUAL(counterSum, 200);
|
||||||
}
|
}
|
||||||
#endif
|
|
||||||
|
|
||||||
BOOST_AUTO_TEST_SUITE_END()
|
BOOST_AUTO_TEST_SUITE_END()
|
||||||
|
|
Loading…
Add table
Reference in a new issue