Skip to content

Revert "Fix deadlock in data-channels-flow-control example. " #682

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
rainliu merged 1 commit into from
May 30, 2025
Merged

Revert "Fix deadlock in data-channels-flow-control example. " #682

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: 1 addition & 4 deletions sctp/src/association/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,7 +430,7 @@ impl Association {
// read from the underlying transport. We do this because the
// user data is passed to the reassembly queue without
// copying.
log::debug!("[{}] receiving {} bytes", name, n);
log::debug!("[{}] recving {} bytes", name, n);
let inbound = Bytes::from(buffer[..n].to_vec());
bytes_received.fetch_add(n, Ordering::SeqCst);

Expand Down Expand Up @@ -468,9 +468,6 @@ impl Association {
'outer: while !done.load(Ordering::Relaxed) {
//log::debug!("[{}] gather_outbound begin", name);
let (packets, continue_loop) = {
// Yielding here fixes a deadlock that crops up when requestor and responder are
// using the same tokio event loop as in examples/data=channels-flow-control
tokio::task::yield_now().await;
let mut ai = association_internal.lock().await;
ai.gather_outbound().await
};
Expand Down
Loading