Skip to content

Fix a race with deadlock detection #15

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

Merged
merged 1 commit into from
Apr 15, 2025
Merged

Fix a race with deadlock detection #15

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 4 additions & 3 deletions rayon-core/src/sleep/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -423,6 +423,10 @@ impl Sleep {
let mut is_blocked = sleep_state.is_blocked.lock().unwrap();
if *is_blocked {
*is_blocked = false;

// Increment the number of active threads
self.data.lock().unwrap().active_threads += 1;

sleep_state.condvar.notify_one();

// When the thread went to sleep, it will have incremented
Expand All @@ -436,9 +440,6 @@ impl Sleep {
// do.
self.counters.sub_sleeping_thread();

// Increment the number of active threads
self.data.lock().unwrap().active_threads += 1;

self.logger.log(|| ThreadNotify { worker: index });

true
Expand Down