Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix deadlocks in condition_variable #689

Merged
merged 2 commits into from
May 17, 2023
Merged

Fix deadlocks in condition_variable #689

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9252490
Relax locks in detail condition_variable notify_all
msimberg May 17, 2023
a46a7ce
Allow set_thread_state to yield again if other thread is active
msimberg May 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions libs/pika/synchronization/src/detail/condition_variable.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,6 +100,7 @@ namespace pika::detail {
// swap the list
queue_type queue;
queue.swap(queue_);
lock.unlock();

if (!queue.empty())
{
Expand All @@ -117,6 +118,7 @@ namespace pika::detail {

if (PIKA_UNLIKELY(!ctx))
{
lock.lock();
prepend_entries(lock, queue);
lock.unlock();

Expand All @@ -125,8 +127,6 @@ namespace pika::detail {
return;
}

[[maybe_unused]] util::ignore_while_checking il(&lock);

ctx.resume();

} while (!queue.empty());
Expand Down
2 changes: 1 addition & 1 deletion libs/pika/threading_base/src/set_thread_state.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ namespace pika::threads::detail {
else
{
pika::execution::this_thread::detail::yield_k(
k % 16, "pika::threads::detail::set_thread_state");
k, "pika::threads::detail::set_thread_state");
++k;

// NOLINTNEXTLINE(bugprone-branch-clone)
Expand Down