mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

test/checkqueue_tests: thread safety annotations

Browse source
This commit is contained in:
Anthony Towns 2020-02-11 16:00:47 +10:00
parent 479c5846f7
commit a788789948
1 changed files with 14 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/test/checkqueue_tests.cpp
View file

@ -3,6 +3,7 @@
// file COPYING or http://www.opensource.org/licenses/mit-license.php. // file COPYING or http://www.opensource.org/licenses/mit-license.php.
#include <checkqueue.h> #include <checkqueue.h>
#include <sync.h>
#include <test/util/setup_common.h> #include <test/util/setup_common.h>
#include <util/memory.h> #include <util/memory.h>
#include <util/system.h> #include <util/system.h>
@ -57,14 +58,14 @@ struct FailingCheck {
}; };
struct UniqueCheck { struct UniqueCheck {
static std::mutex m; static Mutex m;
static std::unordered_multiset<size_t> results; static std::unordered_multiset<size_t> results GUARDED_BY(m);
size_t check_id; size_t check_id;
UniqueCheck(size_t check_id_in) : check_id(check_id_in){}; UniqueCheck(size_t check_id_in) : check_id(check_id_in){};
UniqueCheck() : check_id(0){}; UniqueCheck() : check_id(0){};
bool operator()() bool operator()()
{ {
std::lock_guard<std::mutex> l(m); LOCK(m);
results.insert(check_id); results.insert(check_id);
return true; return true;
} }
@ -127,7 +128,7 @@ struct FrozenCleanupCheck {
std::mutex FrozenCleanupCheck::m{}; std::mutex FrozenCleanupCheck::m{};
std::atomic<uint64_t> FrozenCleanupCheck::nFrozen{0}; std::atomic<uint64_t> FrozenCleanupCheck::nFrozen{0};
std::condition_variable FrozenCleanupCheck::cv{}; std::condition_variable FrozenCleanupCheck::cv{};
std::mutex UniqueCheck::m; Mutex UniqueCheck::m;
std::unordered_multiset<size_t> UniqueCheck::results; std::unordered_multiset<size_t> UniqueCheck::results;
std::atomic<size_t> FakeCheckCheckCompletion::n_calls{0}; std::atomic<size_t> FakeCheckCheckCompletion::n_calls{0};
std::atomic<size_t> MemoryCheck::fake_allocated_memory{0}; std::atomic<size_t> MemoryCheck::fake_allocated_memory{0};
@ -290,11 +291,15 @@ BOOST_AUTO_TEST_CASE(test_CheckQueue_UniqueCheck)
control.Add(vChecks); control.Add(vChecks);
} }
} }
bool r = true; {
BOOST_REQUIRE_EQUAL(UniqueCheck::results.size(), COUNT); LOCK(UniqueCheck::m);
for (size_t i = 0; i < COUNT; ++i) bool r = true;
r = r && UniqueCheck::results.count(i) == 1; BOOST_REQUIRE_EQUAL(UniqueCheck::results.size(), COUNT);
BOOST_REQUIRE(r); for (size_t i = 0; i < COUNT; ++i) {
r = r && UniqueCheck::results.count(i) == 1;
}
BOOST_REQUIRE(r);
}
tg.interrupt_all(); tg.interrupt_all();
tg.join_all(); tg.join_all();
} }