LBRYCommunity/lbrycrd
1
0
Fork 0
Code Issues 29 Pull requests 1 Projects Releases 32 Packages Wiki Activity

Merge #14969: tests: Fix cuckoocache_tests TSAN failure introduced in 14935.

Browse source 
d98a29ec40 Fix cuckoocache_tests TSAN failure introduced in #14935. Fixes #14967. (practicalswift)

Pull request description:

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

Tree-SHA512: aabbfa3ab41d9f498151a9b50a2a875fd51ed609bb54d89292114f59392aae57c85fdd5b7a04b589fbf598aaf736b425a6f62b12c806a1fa23bdd45d2d2accfb
This commit is contained in:
Wladimir J. van der Laan 2018-12-16 12:11:19 +01:00
commit 3424171685
No known key found for this signature in database
GPG key ID: 1E4AED62986CD25D
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/test/checkqueue_tests.cpp
View file

@ -355,7 +355,8 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_FrozenCleanup)
// would get called twice). // would get called twice).
vChecks[0].should_freeze = true; vChecks[0].should_freeze = true;
control.Add(vChecks); 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); std::unique_lock<std::mutex> l(FrozenCleanupCheck::m);

6
src/test/cuckoocache_tests.cpp
View file

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