Skip to content
Merged
Changes from all commits
Commits
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
55 changes: 53 additions & 2 deletions src/body/chan.rs
Original file line number Diff line number Diff line change
Expand Up @@ -207,17 +207,23 @@ impl Drop for Sender {
fn drop(&mut self) {
let mut state = self.shared.state.lock().panic_if_poisoned();
state.sender_open = false;
let receiver_open = state.receiver_open;
drop(state);
self.shared.receiver_waker.wake();
if receiver_open {
self.shared.receiver_waker.wake();
}
}
}

impl Drop for Receiver {
fn drop(&mut self) {
let mut state = self.shared.state.lock().panic_if_poisoned();
state.receiver_open = false;
let sender_open = state.sender_open;
drop(state);
self.shared.sender_waker.wake();
if sender_open {
self.shared.sender_waker.wake();
}
}
}

Expand All @@ -233,6 +239,11 @@ impl fmt::Debug for Sender {

#[cfg(test)]
mod tests {
use std::{
sync::atomic::{AtomicUsize, Ordering},
task::{Wake, Waker},
};

use super::*;

async fn recv(rx: &mut Receiver) -> Option<Result<Bytes, crate::Error>> {
Expand Down Expand Up @@ -262,4 +273,44 @@ mod tests {
assert!(recv(&mut rx).await.is_none());
assert_eq!(rx.take_trailers().unwrap()["x-trailer"], "value");
}

#[test]
fn drop_wakes_only_an_open_peer() {
struct Count(AtomicUsize);

impl Wake for Count {
fn wake(self: Arc<Self>) {
self.0.fetch_add(1, Ordering::Relaxed);
}
}

let count = Arc::new(Count(AtomicUsize::new(0)));
let waker = Waker::from(count.clone());
let mut cx = Context::from_waker(&waker);
let wakes = || count.0.load(Ordering::Relaxed);

// A receiver dropped after the sender does not wake the sender's stale waker.
let (mut tx, rx) = channel(true);
assert!(tx.poll_ready(&mut cx).is_pending());
drop(tx);
drop(rx);
assert_eq!(wakes(), 0);

// Nor does a sender dropped after the receiver.
let (tx, mut rx) = channel(false);
assert!(rx.poll_next(&mut cx).is_pending());
drop(rx);
drop(tx);
assert_eq!(wakes(), 0);

// An open peer is still woken to observe the close.
let (mut tx, rx) = channel(true);
assert!(tx.poll_ready(&mut cx).is_pending());
drop(rx);
assert_eq!(wakes(), 1);
let (tx, mut rx) = channel(false);
assert!(rx.poll_next(&mut cx).is_pending());
drop(tx);
assert_eq!(wakes(), 2);
}
}
Loading