Skip to content

Commit

Permalink
sync: apply cooperative scheduling to sync::broadcast::Receiver (#6870)
Browse files Browse the repository at this point in the history
  • Loading branch information
tglane authored Sep 26, 2024
1 parent c8af499 commit 21df16d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
4 changes: 2 additions & 2 deletions tokio/src/sync/broadcast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@
use crate::loom::cell::UnsafeCell;
use crate::loom::sync::atomic::{AtomicBool, AtomicUsize};
use crate::loom::sync::{Arc, Mutex, MutexGuard, RwLock, RwLockReadGuard};
use crate::runtime::coop::cooperative;
use crate::util::linked_list::{self, GuardedLinkedList, LinkedList};
use crate::util::WakeList;

Expand Down Expand Up @@ -1262,8 +1263,7 @@ impl<T: Clone> Receiver<T> {
/// }
/// ```
pub async fn recv(&mut self) -> Result<T, RecvError> {
let fut = Recv::new(self);
fut.await
cooperative(Recv::new(self)).await
}

/// Attempts to return a pending value on this receiver without awaiting.
Expand Down
16 changes: 16 additions & 0 deletions tokio/tests/sync_broadcast.rs
Original file line number Diff line number Diff line change
Expand Up @@ -640,3 +640,19 @@ fn send_in_waker_drop() {
// Shouldn't deadlock.
let _ = tx.send(());
}

#[tokio::test]
async fn receiver_recv_is_cooperative() {
let (tx, mut rx) = broadcast::channel(8);

tokio::select! {
biased;
_ = async {
loop {
assert!(tx.send(()).is_ok());
assert!(rx.recv().await.is_ok());
}
} => {},
_ = tokio::task::yield_now() => {},
}
}

0 comments on commit 21df16d

Please sign in to comment.