Skip to content

fix: spawn tasks in Stream::buffered and Stream::buffer_unordered to max concurrency #2962

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
wants to merge 4 commits into
base: master
Choose a base branch
from
+95 −69
Open

fix: spawn tasks in Stream::buffered and Stream::buffer_unordered to max concurrency #2962

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
14ed012
fix: spawn tasks in Stream::buffered and Stream::buffer_unordered to …
andylokandy Jul 22, 2025
90f5a74
add comment
andylokandy Jul 22, 2025
e8f3dc0
fix
andylokandy Jul 23, 2025
b98f4ae
fix
andylokandy Jul 24, 2025
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
Prev Previous commit
Next Next commit
fix
  • Loading branch information
@andylokandy
andylokandy committed Jul 23, 2025
commit e8f3dc0bde5f3261c698b5e5006e69950825e6bf
15 changes: 4 additions & 11 deletions futures-util/src/stream/stream/buffer_unordered.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -88,18 +88,11 @@ where
}
}

// If we have any ready outputs, return the first one.
if let Some(output) = this.ready_queue.pop() {
// If there are still ready outputs, wake the task to poll again.
if !this.ready_queue.is_empty() {
cx.waker().wake_by_ref();
}

return Poll::Ready(Some(output));
}

// If more values are still coming from the stream, we're not done yet.
if this.stream.is_done() && this.in_progress_queue.is_empty() {
// If we have any ready outputs, return the first one.
Poll::Ready(Some(output))
} else if this.stream.is_done() && this.in_progress_queue.is_empty() {
// If more values are still coming from the stream, we're not done yet.
Poll::Ready(None)
} else {
Poll::Pending
Expand Down
15 changes: 4 additions & 11 deletions futures-util/src/stream/stream/buffered.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,11 @@ where
}
}

// If we have any ready outputs, return the first one.
if let Some(output) = this.ready_queue.pop_front() {
// If there are still ready outputs, wake the task to poll again.
if !this.ready_queue.is_empty() {
cx.waker().wake_by_ref();
}

return Poll::Ready(Some(output));
}

// If more values are still coming from the stream, we're not done yet.
if this.stream.is_done() && this.in_progress_queue.is_empty() {
// If we have any ready outputs, return the first one.
Poll::Ready(Some(output))
} else if this.stream.is_done() && this.in_progress_queue.is_empty() {
// If more values are still coming from the stream, we're not done yet.
Poll::Ready(None)
} else {
Poll::Pending
Expand Down
Loading