Skip to content

Reduce code size of thread::set_current #123356

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

Merged
bors merged 3 commits into from
May 4, 2024
Merged

Reduce code size of thread::set_current #123356

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e7b5730
std: reduce code size of `set_current`
joboet Apr 2, 2024
061d873
std: add comment about abort motivation
joboet Apr 3, 2024
37c1758
std: update abort message in `thread::set_current`
joboet Apr 8, 2024
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
9 changes: 7 additions & 2 deletions library/std/src/thread/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,9 +684,14 @@ thread_local! {

/// Sets the thread handle for the current thread.
///
/// Panics if the handle has been set already or when called from a TLS destructor.
/// Aborts if the handle has been set already to reduce code size.
pub(crate) fn set_current(thread: Thread) {
CURRENT.with(|current| current.set(thread).unwrap());
// Using `unwrap` here can add ~3kB to the binary size. We have complete
// control over where this is called, so just abort if there is a bug.
CURRENT.with(|current| match current.set(thread) {
Ok(()) => {}
Err(_) => rtabort!("should only be set once"),
});
}

/// Gets a handle to the thread that invokes it.
Expand Down