diff options
author | fanquake <fanquake@gmail.com> | 2020-04-19 11:28:30 +0800 |
---|---|---|
committer | fanquake <fanquake@gmail.com> | 2020-04-19 11:53:25 +0800 |
commit | d65631171cf87a1b25d50317a9e27338a4dc0d8b (patch) | |
tree | bd555df7f83dbc703ca73134a145258ecf182b77 /src | |
parent | 6ae99aab5d97b06d46ff940111b290f1eeb90045 (diff) | |
parent | 27abd1a4f4c7a3d092d59edbbaa1e0f324c8b0ef (diff) |
Merge #18695: test: Replace boost::mutex with std::mutex
27abd1a4f4c7a3d092d59edbbaa1e0f324c8b0ef test: Replace boost::mutex with std::mutex (Hennadii Stepanov)
Pull request description:
This PR replaces `boost::mutex` with `std::mutex` in the `scheduler_tests` test suite.
ACKs for top commit:
theStack:
ACK https://github.com/bitcoin/bitcoin/pull/18695/commits/27abd1a4f4c7a3d092d59edbbaa1e0f324c8b0ef
sipa:
utACK 27abd1a4f4c7a3d092d59edbbaa1e0f324c8b0ef
Tree-SHA512: 062eed360a68910fb71552fd892bfd097442718a237446cfb8350bfd5d807da7251ead2b9755e1d7022598774ed23fa5432a589ac6f8cadddab404b439883466
Diffstat (limited to 'src')
-rw-r--r-- | src/test/scheduler_tests.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/test/scheduler_tests.cpp b/src/test/scheduler_tests.cpp index 05482dfc4e..1395a7f38c 100644 --- a/src/test/scheduler_tests.cpp +++ b/src/test/scheduler_tests.cpp @@ -9,12 +9,14 @@ #include <boost/test/unit_test.hpp> #include <boost/thread.hpp> +#include <mutex> + BOOST_AUTO_TEST_SUITE(scheduler_tests) -static void microTask(CScheduler& s, boost::mutex& mutex, int& counter, int delta, std::chrono::system_clock::time_point rescheduleTime) +static void microTask(CScheduler& s, std::mutex& mutex, int& counter, int delta, std::chrono::system_clock::time_point rescheduleTime) { { - boost::unique_lock<boost::mutex> lock(mutex); + std::lock_guard<std::mutex> lock(mutex); counter += delta; } std::chrono::system_clock::time_point noTime = std::chrono::system_clock::time_point::min(); @@ -38,7 +40,7 @@ BOOST_AUTO_TEST_CASE(manythreads) // counters should sum to the number of initial tasks performed. CScheduler microTasks; - boost::mutex counterMutex[10]; + std::mutex counterMutex[10]; int counter[10] = { 0 }; FastRandomContext rng{/* fDeterministic */ true}; auto zeroToNine = [](FastRandomContext& rc) -> int { return rc.randrange(10); }; // [0, 9] |