Skip to content

7996: sync: fix notify_waiters priority in Notify #87

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

Open
martin-augment wants to merge 1 commit into
base: master
Choose a base branch
from
Open

7996: sync: fix notify_waiters priority in Notify #87

Show file tree
Hide file tree
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
5 changes: 5 additions & 0 deletions tokio/src/sync/notify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1118,6 +1118,11 @@ impl NotifiedProject<'_> {
State::Init => {
let curr = notify.state.load(SeqCst);

if get_num_notify_waiters_calls(curr) != *notify_waiters_calls {
*state = State::Done;
continue 'outer_loop;
}

// Optimistically try acquiring a pending notification
let res = notify.state.compare_exchange(
set_state(curr, NOTIFIED),
Expand Down
12 changes: 12 additions & 0 deletions tokio/tests/sync_notify.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -301,3 +301,15 @@ fn test_waker_update() {

assert!(future.is_woken());
}

#[test]
fn notify_one_has_priority_over_notify_waiters() {
use futures::FutureExt;
let notify = tokio::sync::Notify::new();
let notified1 = notify.notified();
notify.notify_waiters();
notify.notify_one();
assert!(notified1.now_or_never().is_some());
let notified2 = notify.notified();
assert!(notified2.now_or_never().is_some());
}
Loading