Fix cuckoocache_tests TSAN failure introduced in #14935. Fixes #14967.

This commit is contained in:
practicalswift 2018-12-15 09:59:24 +01:00
parent 9133227298
commit d98a29ec40
2 changed files with 6 additions and 3 deletions

View file

@ -355,7 +355,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
// would get called twice).
vChecks[0].should_freeze = true;
control.Add(vChecks);
BOOST_CHECK(control.Wait()); // Hangs here
bool waitResult = control.Wait(); // Hangs here
assert(waitResult);
});
{
std::unique_lock<std::mutex> l(FrozenCleanupCheck::m);

View file

@ -220,8 +220,10 @@ static void test_cache_erase_parallel(size_t megabytes)
size_t ntodo = (n_insert/4)/3;
size_t start = ntodo*x;
size_t end = ntodo*(x+1);
for (uint32_t i = start; i < end; ++i)
BOOST_CHECK(set.contains(hashes[i], true));
for (uint32_t i = start; i < end; ++i) {
bool contains = set.contains(hashes[i], true);
assert(contains);
}
});
/** Wait for all threads to finish