-
-
Notifications
You must be signed in to change notification settings - Fork 2.5k
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.
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
feat: Add poll_recv_many
for Receiver
& UnboundedReceiver
#6236
feat: Add poll_recv_many
for Receiver
& UnboundedReceiver
#6236
Conversation
Add a new API poll_recv_many for Receiver & UnboundedReceiver
Here is the documentation for
|
@Darksonn Thanks for your feedback! I've revised the documentation to be more detailed & clear on what this API does. Could you review again ? Thanks |
tokio/src/sync/mpsc/bounded.rs
Outdated
/// spurious failure happens. In such cases, the `Waker` from the `Context` is scheduled | ||
/// to be woken up when new messages are sent on the channel or when the channel is closed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The part about the waker should be moved below this list, similar to poll_recv
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks & I've included your suggestions in my latest commit
tokio/src/sync/mpsc/bounded.rs
Outdated
/// * `Poll::Ready(count)` where `count` is the number of messages successfully received and | ||
/// stored in `buffer`. This can be less than, or equal to, `limit`. If the channel is closed | ||
/// and there are no more messages to receive, `count` will be the number of messages received | ||
/// before the channel was closed, which could be zero. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I would split this into two cases: Poll::Ready(count)
for count > 0
and Poll::Ready(0)
. The length-zero case is special because it only happens when the channel is closed (or n == 0
).
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yup that will be much clearer. I've split it into 2
tokio/src/sync/mpsc/bounded.rs
Outdated
/// This method attempts to receive messages from the channel and store them in the provided buffer, | ||
/// up to the specified `limit`. It behaves similarly to `poll_recv` but for multiple messages. If `limit` | ||
/// is zero, the function returns immediately with `0`. | ||
/// | ||
/// This method also shares similarities with `recv_many`, including its behavior in response to channel closure | ||
/// and message availability. For `limit > 0`, if there are no messages in the channel's queue, | ||
/// but the channel has not yet been closed, this method will sleep until a message is sent or | ||
/// the channel is closed. The channel is closed when all senders have been dropped, or when `close` is called. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two paragraphs can probably just be deleted. As long as the list below is comprehensive, this isn't necessary, and it is obvious that it is similar to poll_recv
and recv_many
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sure & deleted
tokio/src/sync/mpsc/bounded.rs
Outdated
/// Note that this method does not guarantee that the buffer will be filled up to `limit` on each call, | ||
/// especially if fewer messages are available. Also, the actual number of messages received can be | ||
/// zero if the channel is empty or closed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The English used here is rather complicated. Perhaps we could simplify it like this?
/// Note that this method does not guarantee that the buffer will be filled up to `limit` on each call, | |
/// especially if fewer messages are available. Also, the actual number of messages received can be | |
/// zero if the channel is empty or closed. | |
/// Note that this method does not guarantee that exactly `limit` messages | |
/// are received. Rather, if at least one message is available, it returns | |
/// as many messages as it can up to the given limit. This method returns | |
/// zero only if the channel is closed (or if `limit` is zero). |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks & I've adopted your suggestion
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Only one changed I'd like left, then I think this is ready to be merged.
tokio/src/sync/mpsc/bounded.rs
Outdated
/// When the method returns `Poll::Pending`, the `Waker` from the `Context` is scheduled | ||
/// to be woken up when new messages are sent on the channel or when the channel is closed. |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please use the same wording as on poll_recv
. That's a standardized wording taking from Future::poll
, and we use the same wording on all poll functions with a note of this kind.
/// When the method returns `Poll::Pending`, the `Waker` from the `Context` is scheduled | |
/// to be woken up when new messages are sent on the channel or when the channel is closed. | |
/// When the method returns `Poll::Pending`, the `Waker` in the provided | |
/// `Context` is scheduled to receive a wakeup when a message is sent on any | |
/// receiver, or when the channel is closed. Note that on multiple calls to | |
/// `poll_recv` or `poll_recv_many`, only the `Waker` from the `Context` | |
/// passed to the most recent call is scheduled to receive a wakeup. |
Please also update the documentation of poll_recv
to say "poll_recv
or poll_recv_many
" like how I did here.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@Darksonn Thanks a lot. I've revised accordingly.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thank you.
Bumps tokio from 1.35.1 to 1.36.0. Release notes Sourced from tokio's releases. Tokio v1.36.0 1.36.0 (February 2nd, 2024) Added io: add tokio::io::Join (#6220) io: implement AsyncWrite for Empty (#6235) net: add support for anonymous unix pipes (#6127) net: add UnixSocket (#6290) net: expose keepalive option on TcpSocket (#6311) sync: add {Receiver,UnboundedReceiver}::poll_recv_many (#6236) sync: add Sender::{try_,}reserve_many (#6205) sync: add watch::Receiver::mark_unchanged (#6252) task: add JoinSet::try_join_next (#6280) Changed io: make copy cooperative (#6265) io: make repeat and sink cooperative (#6254) io: simplify check for empty slice (#6293) process: use pidfd on Linux when available (#6152) sync: use AtomicBool in broadcast channel future (#6298) Documented io: clarify clear_ready docs (#6304) net: document that *Fd traits on TcpSocket are unix-only (#6294) sync: document FIFO behavior of tokio::sync::Mutex (#6279) chore: typographic improvements (#6262) runtime: remove obsolete comment (#6303) task: fix typo (#6261) #6220: tokio-rs/tokio#6220 #6235: tokio-rs/tokio#6235 #6127: tokio-rs/tokio#6127 #6290: tokio-rs/tokio#6290 #6311: tokio-rs/tokio#6311 #6236: tokio-rs/tokio#6236 #6205: tokio-rs/tokio#6205 #6252: tokio-rs/tokio#6252 #6280: tokio-rs/tokio#6280 #6265: tokio-rs/tokio#6265 #6254: tokio-rs/tokio#6254 #6293: tokio-rs/tokio#6293 #6238: tokio-rs/tokio#6238 #6152: tokio-rs/tokio#6152 #6298: tokio-rs/tokio#6298 #6262: tokio-rs/tokio#6262 #6303: tokio-rs/tokio#6303 #6261: tokio-rs/tokio#6261 ... (truncated) Commits eaf81ed chore: prepare Tokio v1.36.0 (#6312) 53f9e5a ci: make sure dictionary words are sorted and unique (#6316) 9077762 net: expose keepalive option on TcpSocket (#6311) 131e7b4 ci: add spellchecking (#6297) e53b92a io: clarify clear_ready docs (#6304) 7536132 sync: use AtomicBool in broadcast channel future (#6298) b6d0c90 macros: fix trait_method breaking change detection (#6308) 4846959 runtime: remove obsolete comment (#6303) ec30383 net: add UnixSocket (#6290) f80bbec io: simplify check for empty slice (#6293) Additional commits viewable in compare view Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase. Dependabot commands and options You can trigger Dependabot actions by commenting on this PR: @dependabot rebase will rebase this PR @dependabot recreate will recreate this PR, overwriting any edits that have been made to it @dependabot merge will merge this PR after your CI passes on it @dependabot squash and merge will squash and merge this PR after your CI passes on it @dependabot cancel merge will cancel a previously requested merge and block automerging @dependabot reopen will reopen this PR if it is closed @dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually @dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency @dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) @dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)
fixes #6209
Add a new API
poll_recv_many
forReceiver
&UnboundedReceiver
Motivation
Further to the implementation of
recv_many
, it is suggested to also add similar functionality for the APIpoll_recv
. Hence, a new APIpoll_recv_many
is createdSolution
This PR adds a new API
poll_recv_many
intoReceiver
&UnboundedReceiver
. An example is also added for reference