-
-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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
sync: add broadcast::Sender<T>::closed
#6685
Conversation
What's the status on this? |
Work has been nuts - haven't had much time for anything else. This is on my backlog though |
No rush from my side. Just wanted to check in. |
1a01e50
to
d73005b
Compare
Pushed up what should be closer to the proper implementation. I'd like to add a I'll dig more into that when I have a bit more time, as well as fix the various CI issues and clean up the code (for example the tail lock will drop when it goes out of scope). |
tokio/src/sync/broadcast.rs
Outdated
self.shared.notify_rx_drop.notified().await; | ||
|
||
poll_fn(|_| { | ||
let tail = self.shared.tail.lock(); | ||
|
||
if tail.closed || tail.rx_cnt == 0 { | ||
return Poll::Ready(()); | ||
} | ||
|
||
drop(tail); | ||
return Poll::Pending; | ||
}) | ||
.await; |
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 poll fn needs to interact with the notified()
future for this to work. Check out this for inspiration:
tokio/tokio-util/src/sync/cancellation_token.rs
Lines 303 to 319 in 5b9a290
fn poll(self: Pin<&mut Self>, cx: &mut Context<'_>) -> Poll<()> { | |
let mut this = self.project(); | |
loop { | |
if this.cancellation_token.is_cancelled() { | |
return Poll::Ready(()); | |
} | |
// No wakeups can be lost here because there is always a call to | |
// `is_cancelled` between the creation of the future and the call to | |
// `poll`, and the code that sets the cancelled flag does so before | |
// waking the `Notified`. | |
if this.future.as_mut().poll(cx).is_pending() { | |
return Poll::Pending; | |
} | |
this.future.set(this.cancellation_token.inner.notified()); | |
} |
You should be able to do something similar without creating a whole future struct if you use tokio::pin!
on the notified()
future.
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.
If we now notify only once, when the last receiver drops, can we just await
the Notified directly? I originally had this block because I notified on every Rx
drop, so had to include an additional check to ensure that we had just dropped the last Rx
.
I'm also trying to get a better understanding of the internals here. For my own understanding - this doesn't work because, after the first call, the internal Future
state machine is progressed to the point where we're already in the poll_fn
and have a Pending
from a non-terminal Rx
dropping. That means that we'd never await the notified()
again. Is that correct?
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.
Yes, Notified
doesn't have spurious wakeups in the scenario we are using it, so it should work. Well, except for the fact that we probably want it to return immediately if it's already closed when we call it. We can do it like this:
loop {
let notified = self.shared.notify_rx_drop.notified();
if self.is_closed() { return; }
notified.await;
}
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, done. I used tail.closed
instead of self.is_closed()
as I couldn't find an is_closed
on Sender
, which means an extra lock.
For my own curiosity, what's the advantage of the loop above vs. a simple self.shared.notify_rx_drop.notified().await
, if Notified
doesn't suffer from spurious wakeups? Now that we only notify once when the last receiver drops, it may be a nice way to avoid that extra lock I mentioned.
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.
If you don't use a loop, then it changes the behavior of the test I requested in #6685 (comment). Which behavior we want is up for discussion.
d73005b
to
a215e6f
Compare
eb0d891
to
43be386
Compare
43be386
to
12d46d0
Compare
2ebc20b
to
e170736
Compare
a4980b3
to
ddb1df2
Compare
ddb1df2
to
31ecff0
Compare
Last failure seems to just be docs-related, so I think we just have to kick the job |
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.
broadcast::Sender<T>::closed
Bumps tokio from 1.43.0 to 1.44.0. Release notes Sourced from tokio's releases. Tokio v1.44.0 1.44.0 (March 7th, 2025) This release changes the from_std method on sockets to panic if a blocking socket is provided. We determined this change is not a breaking change as Tokio is not intended to operate using blocking sockets. Doing so results in runtime hangs and should be considered a bug. Accidentally passing a blocking socket to Tokio is one of the most common user mistakes. If this change causes an issue for you, please comment on #7172. Added coop: add task::coop module (#7116) process: add Command::get_kill_on_drop() (#7086) sync: add broadcast::Sender::closed (#6685, #7090) sync: add broadcast::WeakSender (#7100) sync: add oneshot::Receiver::is_empty() (#7153) sync: add oneshot::Receiver::is_terminated() (#7152) Fixed fs: empty reads on File should not start a background read (#7139) process: calling start_kill on exited child should not fail (#7160) signal: fix CTRL_CLOSE, CTRL_LOGOFF, CTRL_SHUTDOWN on windows (#7122) sync: properly handle panic during mpsc drop (#7094) Changes runtime: clean up magic number in registration set (#7112) coop: make coop yield using waker defer strategy (#7185) macros: make select! budget-aware (#7164) net: panic when passing a blocking socket to from_std (#7166) io: clean up buffer casts (#7142) Changes to unstable APIs rt: add before and after task poll callbacks (#7120) tracing: make the task tracing API unstable public (#6972) Documented docs: fix nesting of sections in top-level docs (#7159) fs: rename symlink and hardlink parameter names (#7143) io: swap reader/writer in simplex doc test (#7176) macros: docs about select! alternatives (#7110) net: rename the argument for send_to (#7146) process: add example for reading Child stdout (#7141) process: clarify Child::kill behavior (#7162) process: fix grammar of the ChildStdin struct doc comment (#7192) runtime: consistently use worker_threads instead of core_threads (#7186) #6685: tokio-rs/tokio#6685 #6972: tokio-rs/tokio#6972 #7086: tokio-rs/tokio#7086 #7090: tokio-rs/tokio#7090 ... (truncated) Commits 8182ecf chore: prepare Tokio v1.44.0 (#7202) a258bff ci: enable printing in multi thread loom tests (#7200) e076d21 process: clarify Child::kill behavior (#7162) 042433c net: debug_assert on creating a tokio socket from a blocking one (#7166) 0284d1b macros: make select! budget-aware (#7164) 710bc80 rt: coop should yield using waker defer strategy (#7185) a2b12bd readme: adjust release schedule to once per month (#7191) e7b593c process: fix grammar of the ChildStdin struct doc comment (#7192) 3aaf4a5 coop: adjust grammar in tests/coop_budget.rs (#7173) 8e741c1 tokio: mark 1.43 as LTS (#7189) 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)
Motivation
Adds a
closed
Future tobroadcast::Sender<T>
, similar to theoneshot
ormpsc
variants, which completes when all subscribed receivers have been dropped.Solution
This is a simple
poll_fn
which wraps a check aroundshared.tail.rx_cnt
, returningReady
if the remaining count is 0.Closes: #6649