Skip to content

Commit d656311

Browse files
committed
Merge #18695: test: Replace boost::mutex with std::mutex
27abd1a 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 bitcoin/bitcoin@27abd1a sipa: utACK 27abd1a Tree-SHA512: 062eed360a68910fb71552fd892bfd097442718a237446cfb8350bfd5d807da7251ead2b9755e1d7022598774ed23fa5432a589ac6f8cadddab404b439883466
2 parents 6ae99aa + 27abd1a commit d656311

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

src/test/scheduler_tests.cpp

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,14 @@
99
#include <boost/test/unit_test.hpp>
1010
#include <boost/thread.hpp>
1111

12+
#include <mutex>
13+
1214
BOOST_AUTO_TEST_SUITE(scheduler_tests)
1315

14-
static void microTask(CScheduler& s, boost::mutex& mutex, int& counter, int delta, std::chrono::system_clock::time_point rescheduleTime)
16+
static void microTask(CScheduler& s, std::mutex& mutex, int& counter, int delta, std::chrono::system_clock::time_point rescheduleTime)
1517
{
1618
{
17-
boost::unique_lock<boost::mutex> lock(mutex);
19+
std::lock_guard<std::mutex> lock(mutex);
1820
counter += delta;
1921
}
2022
std::chrono::system_clock::time_point noTime = std::chrono::system_clock::time_point::min();
@@ -38,7 +40,7 @@ BOOST_AUTO_TEST_CASE(manythreads)
3840
// counters should sum to the number of initial tasks performed.
3941
CScheduler microTasks;
4042

41-
boost::mutex counterMutex[10];
43+
std::mutex counterMutex[10];
4244
int counter[10] = { 0 };
4345
FastRandomContext rng{/* fDeterministic */ true};
4446
auto zeroToNine = [](FastRandomContext& rc) -> int { return rc.randrange(10); }; // [0, 9]

0 commit comments

Comments
 (0)