Skip to content

rt: make is_rt_shutdown_err method public #7771

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

Jump to bottom
Merged
Darksonn merged 7 commits into from
Jan 7, 2026
Merged

rt: make is_rt_shutdown_err method public #7771

Darksonn merged 7 commits into from
Jan 7, 2026
+153 −42

Conversation

@Keruspe
Copy link
Contributor

@Keruspe Keruspe commented Dec 10, 2025

This introduces tokio::runtime::is_rt_shutdown_err and uses it in pidfd_reaper where it was previously defined.

Fixes #7701

@Keruspe Keruspe marked this pull request as draft December 11, 2025 07:54
@Keruspe
rt: make is_rt_shutdown_err method public
0ca69e7 
This introduces tokio::runtime::is_rt_shutdown_err and uses it in
pidfd_reaper where it was previously defined.

Fixes tokio-rs#7701
@Keruspe Keruspe marked this pull request as ready for review December 11, 2025 08:06
@ADD-SP ADD-SP added A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime labels Dec 11, 2025
martin-g
martin-g reviewed Dec 16, 2025
View reviewed changes
Darksonn
Darksonn reviewed Dec 16, 2025
View reviewed changes
Copy link
Contributor

@Darksonn Darksonn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the PR! It looks reasonable.

ADD-SP
ADD-SP reviewed Dec 25, 2025
View reviewed changes
Copy link
Member

@ADD-SP ADD-SP left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you add a simple test for this new interface?

@ADD-SP ADD-SP added the S-waiting-on-author Status: awaiting some action (such as code changes) from the PR or issue author. label Dec 31, 2025
@Keruspe
Copy link
Contributor Author

Keruspe commented Jan 4, 2026

Sorry, I haven't gotten back on this yet, I might be able to update this this week

@Darksonn
Copy link
Contributor

Darksonn commented Jan 4, 2026

No rush. I was just going through the list of open PRs.

@Keruspe
Copy link
Contributor Author

Keruspe commented Jan 7, 2026

@Darksonn since you added some tests, do you want me to try and iterate on top of that or do you want to finish it up?

@Darksonn
Copy link
Contributor

Darksonn commented Jan 7, 2026

Hrm, it looks like I added tests that don't pass on panic=abort, sorry about that. You can add #[cfg_attr(not(panic="abort"), ignore)] to the relevant tests.

I think this PR is probably fine as-is, unless you have other ideas for additional changes.

@Keruspe
rt: try to make the CI pass
afeee34 
disable rustdoc test for wasm (like the other ones around for rt)
disable a test when panic=abort is enabled
@Keruspe Keruspe force-pushed the rt-shutdown-error branch from 2ca0982 to afeee34 Compare January 7, 2026 07:18
@Keruspe
Copy link
Contributor Author

Keruspe commented Jan 7, 2026

Nothing more on my side apart the tests fixing. Should be good now for panic=abort and wasm. Not sure what the problem is for miri if not transient

Darksonn
Darksonn approved these changes Jan 7, 2026
View reviewed changes
Copy link
Contributor

@Darksonn Darksonn left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you

@Darksonn Darksonn enabled auto-merge (squash) January 7, 2026 07:36
@Darksonn
Copy link
Contributor

Darksonn commented Jan 7, 2026

For the miri error lets add:

#![cfg(not(miri))] // No socket in miri.

auto-merge was automatically disabled January 7, 2026 08:07

Head branch was pushed to by a user without write access

@Darksonn Darksonn enabled auto-merge (squash) January 7, 2026 08:08
@Darksonn Darksonn merged commit d65165f into tokio-rs:master Jan 7, 2026
88 checks passed
winter-loo pushed a commit to winter-loo/tokio that referenced this pull request Jan 9, 2026
@Keruspe @winter-loo
rt: make is_rt_shutdown_err method public (tokio-rs#7771)
9bbd70c
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@martin-g martin-g martin-g approved these changes

@ADD-SP ADD-SP ADD-SP left review comments

@Darksonn Darksonn Darksonn approved these changes

Assignees

No one assigned

Labels

A-tokio Area: The main tokio crate M-runtime Module: tokio/runtime S-waiting-on-author Status: awaiting some action (such as code changes) from the PR or issue author.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Add a way to check whether the context is being shut down

4 participants

@Keruspe @Darksonn @martin-g @ADD-SP