std: make thread::current available in all thread_local! destructors
#127912
+543
−138
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rustbot
added
O-hermit
joboet
commented
Jul 18, 2024
This comment has been minimized.
This comment has been minimized.
joboet
force-pushed
the
tls_dtor_thread_current
branch
from
7dd342e
to
f4486ee
Compare
This comment has been minimized.
This comment has been minimized.
joboet
force-pushed
the
tls_dtor_thread_current
branch
from
f4486ee
to
fa1cb86
Compare
This comment has been minimized.
This comment has been minimized.
|
☔ The latest upstream changes (presumably #127924) made this pull request unmergeable. Please resolve the merge conflicts. |
joboet
force-pushed
the
tls_dtor_thread_current
branch
from
fa1cb86
to
4459a4f
Compare
|
The Miri subtree was changed cc @rust-lang/miri |
26 tasks
joboet
force-pushed
the
tls_dtor_thread_current
branch
from
4459a4f
to
d6777a9
Compare
|
☔ The latest upstream changes (presumably #128213) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Needs a rebase, but I think it looks ok, so @rustbot author |
rustbot
added
S-waiting-on-author
joboet
force-pushed
the
tls_dtor_thread_current
branch
from
d6777a9
to
cfbd250
Compare
|
T'was just a few imports and an @bors r=cupiver |
bors
added
S-waiting-on-bors
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Aug 29, 2024
…cupiver std: make `thread::current` available in all `thread_local!` destructors ... and thereby allow the panic runtime to always print the right thread name. This works by modifying the TLS destructor system to schedule a runtime cleanup function after all other TLS destructors registered by `std` have run. Unfortunately, this doesn't affect foreign TLS destructors, `thread::current` will still panic there. Additionally, the thread ID returned by `current_id` will now always be available, even inside the global allocator, and will not change during the lifetime of one thread (this was previously the case with key-based TLS). The mechanisms I added for this (`local_pointer` and `thread_cleanup`) will also allow finally fixing rust-lang#111272 by moving the signal stack to a similar runtime-cleanup TLS variable.
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Aug 29, 2024
…cupiver std: make `thread::current` available in all `thread_local!` destructors ... and thereby allow the panic runtime to always print the right thread name. This works by modifying the TLS destructor system to schedule a runtime cleanup function after all other TLS destructors registered by `std` have run. Unfortunately, this doesn't affect foreign TLS destructors, `thread::current` will still panic there. Additionally, the thread ID returned by `current_id` will now always be available, even inside the global allocator, and will not change during the lifetime of one thread (this was previously the case with key-based TLS). The mechanisms I added for this (`local_pointer` and `thread_cleanup`) will also allow finally fixing rust-lang#111272 by moving the signal stack to a similar runtime-cleanup TLS variable.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Aug 29, 2024
…kingjubilee Rollup of 9 pull requests Successful merges: - rust-lang#120221 (Don't make statement nonterminals match pattern nonterminals) - rust-lang#127912 (std: make `thread::current` available in all `thread_local!` destructors) - rust-lang#128166 (Improved `checked_isqrt` and `isqrt` methods) - rust-lang#129123 (rustdoc-json: Add test for `Self` type) - rust-lang#129366 (linker: Synchronize native library search in rustc and linker) - rust-lang#129527 (Don't use `TyKind` in a lint) - rust-lang#129534 (Deny `wasm_c_abi` lint to nudge the last 25%) - rust-lang#129640 (Re-enable android tests/benches in alloc/core) - rust-lang#129675 (allow BufReader::peek to be called on unsized types) r? `@ghost` `@rustbot` modify labels: rollup
workingjubilee
requested changes
Aug 29, 2024
| // iterate the destructor list with this function: | ||
| #[allow(unused)] | ||
| #[cfg(not(all(target_family = "wasm", not(target_feature = "atomics"))))] |
There was a problem hiding this comment.
error[E0432]: unresolved import `super::destructors`
--> std/src/sys/thread_local/mod.rs:102:28
|
102 | use super::destructors::run;
| ^^^^^^^^^^^ could not find `destructors` in `super`
|
note: found an item that was configured out
--> std/src/sys/thread_local/mod.rs:54:16
|
54 | pub(crate) mod destructors {
| ^^^^^^^^^^^
note: the item is gated here
--> std/src/sys/thread_local/mod.rs:53:1
|
53 | #[cfg(all(target_thread_local, not(all(target_family = "wasm", not(target_feature = "atomics")))))]
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
@bors r- |
bors
added
S-waiting-on-author
|
☔ The latest upstream changes (presumably #129873) made this pull request unmergeable. Please resolve the merge conflicts. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
... and thereby allow the panic runtime to always print the right thread name.
This works by modifying the TLS destructor system to schedule a runtime cleanup function after all other TLS destructors registered by
stdhave run. Unfortunately, this doesn't affect foreign TLS destructors,thread::currentwill still panic there.Additionally, the thread ID returned by
current_idwill now always be available, even inside the global allocator, and will not change during the lifetime of one thread (this was previously the case with key-based TLS).The mechanisms I added for this (
local_pointerandthread_cleanup) will also allow finally fixing #111272 by moving the signal stack to a similar runtime-cleanup TLS variable.