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

Update thread_runner to block on hand-rolled barrier, add yield points to hash, key_equal

Browse Source
This commit is contained in:
Christian Mazakas
2023-04-20 14:34:01 -07:00
parent e08f9f11a1
commit 5dfed4deec
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
test/cfoa/helpers.hpp
View File

@ -24,6 +24,7 @@ struct transp_hash
template <class T> std::size_t operator()(T const& t) const noexcept template <class T> std::size_t operator()(T const& t) const noexcept
{ {
std::this_thread::yield();
return boost::hash<T>()(t); return boost::hash<T>()(t);
} }
}; };
@ -34,6 +35,7 @@ struct transp_key_equal
template <class T, class U> bool operator()(T const& lhs, U const& rhs) const template <class T, class U> bool operator()(T const& lhs, U const& rhs) const
{ {
std::this_thread::yield();
return lhs == rhs; return lhs == rhs;
} }
}; };
@ -57,6 +59,7 @@ struct stateful_hash
{ {
std::size_t h = static_cast<std::size_t>(x_); std::size_t h = static_cast<std::size_t>(x_);
boost::hash_combine(h, t); boost::hash_combine(h, t);
std::this_thread::yield();
return h; return h;
} }
@ -86,6 +89,7 @@ struct stateful_key_equal
template <class T, class U> bool operator()(T const& t, U const& u) const template <class T, class U> bool operator()(T const& t, U const& u) const
{ {
std::this_thread::yield();
return t == u; return t == u;
} }
@ -276,16 +280,22 @@ template <class T, class F> void thread_runner(std::vector<T>& values, F f)
{ {
std::mutex m; std::mutex m;
std::condition_variable cv; std::condition_variable cv;
bool ready = false; std::size_t c = 0;
std::vector<std::thread> threads; std::vector<std::thread> threads;
auto subslices = split<T>(values, num_threads); auto subslices = split<T>(values, num_threads);
for (std::size_t i = 0; i < num_threads; ++i) { for (std::size_t i = 0; i < num_threads; ++i) {
threads.emplace_back([&f, &subslices, i, &m, &cv, &ready] { threads.emplace_back([&f, &subslices, i, &m, &cv, &c] {
{ {
std::unique_lock<std::mutex> lk(m); std::unique_lock<std::mutex> lk(m);
cv.wait(lk, [&] { return ready; }); ++c;
if (c == num_threads) {
lk.unlock();
cv.notify_all();
} else {
cv.wait(lk, [&] { return c == num_threads; });
}
} }
auto s = subslices[i]; auto s = subslices[i];
@ -293,12 +303,6 @@ template <class T, class F> void thread_runner(std::vector<T>& values, F f)
}); });
} }
{
std::lock_guard<std::mutex> guard(m);
ready = true;
}
cv.notify_all();
for (auto& t : threads) { for (auto& t : threads) {
t.join(); t.join();
} }