boostorg/unordered
1
0
Fork 1
mirror of https://github.com/boostorg/unordered.git synced 2025-07-30 11:27:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update tests to use condition variables for work synchronization instead of sleeps

Browse Source
This commit is contained in:
Christian Mazakas
2023-04-20 12:57:00 -07:00
parent 0e8affcc07
commit c304284773
2 changed files with 56 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
test/cfoa/constructor_tests.cpp
View File

@ -297,11 +297,20 @@ namespace {
boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
raii::reset_counts();
std::mutex m;
std::condition_variable cv;
bool ready = false;
{
map_type x(0, hasher(1), key_equal(2), allocator_type{});
auto f = [&x, &values] {
std::this_thread::sleep_for(std::chrono::milliseconds(75));
auto f = [&x, &values, &m, &cv, &ready] {
{
std::lock_guard<std::mutex> guard(m);
ready = true;
}
cv.notify_all();
for (auto const& val : values) {
x.insert(val);
}
@ -311,9 +320,15 @@ namespace {
std::thread t2(f);
thread_runner(
values, [&x, &reference_map, &values, rg](
values, [&x, &reference_map, &values, rg, &m, &cv, &ready](
boost::span<span_value_type<decltype(values)> > s) {
(void)s;
{
std::unique_lock<std::mutex> lk(m);
cv.wait(lk, [&] { return ready; });
}
map_type y(x);
BOOST_TEST_LE(y.size(), values.size());
@ -483,12 +498,12 @@ namespace {
BOOST_TEST_EQ(y.hash_function(), hasher(1));
BOOST_TEST_EQ(y.key_eq(), key_equal(2));
} else {
BOOST_TEST_EQ(y.size(), 0);
BOOST_TEST_EQ(y.size(), 0u);
BOOST_TEST_EQ(y.hash_function(), hasher());
BOOST_TEST_EQ(y.key_eq(), key_equal());
}
BOOST_TEST_EQ(x.size(), 0);
BOOST_TEST_EQ(x.size(), 0u);
BOOST_TEST_EQ(x.hash_function(), hasher());
BOOST_TEST_EQ(x.key_eq(), key_equal());
@ -511,11 +526,20 @@ namespace {
boost::unordered_flat_map<raii, raii>(values.begin(), values.end());
raii::reset_counts();
std::mutex m;
std::condition_variable cv;
bool ready = false;
{
map_type x(0, hasher(1), key_equal(2), allocator_type{});
auto f = [&x, &values] {
std::this_thread::sleep_for(std::chrono::milliseconds(25));
auto f = [&x, &values, &m, &cv, &ready] {
{
std::lock_guard<std::mutex> guard(m);
ready = true;
}
cv.notify_all();
for (auto const& val : values) {
x.insert(val);
}
@ -527,10 +551,15 @@ namespace {
std::thread t2(f);
thread_runner(
values, [&x, &reference_map, &num_transfers, rg](
values, [&x, &reference_map, &num_transfers, rg, &m, &ready, &cv](
boost::span<span_value_type<decltype(values)> > s) {
(void)s;
{
std::unique_lock<std::mutex> lk(m);
cv.wait(lk, [&] { return ready; });
}
map_type y(std::move(x));
if (!y.empty()) {

21
test/cfoa/helpers.hpp
View File

@ -9,8 +9,10 @@
#include <boost/unordered/unordered_flat_map.hpp>
#include <atomic>
#include <condition_variable>
#include <cstddef>
#include <iostream>
#include <mutex>
#include <thread>
#include <vector>
@ -272,16 +274,31 @@ std::vector<boost::span<T> > split(
template <class T, class F> void thread_runner(std::vector<T>& values, F f)
{
std::mutex m;
std::condition_variable cv;
bool ready = false;
std::vector<std::thread> threads;
auto subslices = split<T>(values, num_threads);
for (std::size_t i = 0; i < num_threads; ++i) {
threads.emplace_back([&f, &subslices, i] {
std::this_thread::sleep_for(std::chrono::milliseconds(100));
threads.emplace_back([&f, &subslices, i, &m, &cv, &ready] {
{
std::unique_lock<std::mutex> lk(m);
cv.wait(lk, [&] { return ready; });
}
auto s = subslices[i];
f(s);
});
}
{
std::lock_guard<std::mutex> guard(m);
ready = true;
}
cv.notify_all();
for (auto& t : threads) {
t.join();
}