Revert "Use OS thread name by default" #123505
Merged
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
This reverts rust-lang#121666 due to rust-lang#123495
rustbot
added
O-hermit
workingjubilee
approved these changes
Apr 5, 2024
Comment on lines
-238
to
-301
| pub fn get_name() -> Option<CString> { | ||
| #[cfg(target_os = "linux")] | ||
| const TASK_COMM_LEN: usize = 16; | ||
| #[cfg(target_os = "freebsd")] | ||
| const TASK_COMM_LEN: usize = libc::MAXCOMLEN + 1; | ||
| #[cfg(any(target_os = "netbsd", target_os = "solaris", target_os = "illumos"))] | ||
| const TASK_COMM_LEN: usize = 32; | ||
| let mut name = vec![0u8; TASK_COMM_LEN]; | ||
| let res = unsafe { | ||
| libc::pthread_getname_np(libc::pthread_self(), name.as_mut_ptr().cast(), name.len()) | ||
| }; | ||
| if res != 0 { | ||
| return None; | ||
| } | ||
| name.truncate(name.iter().position(|&c| c == 0)?); | ||
| CString::new(name).ok() | ||
| } | ||
|
|
||
| #[cfg(any(target_os = "macos", target_os = "ios", target_os = "tvos", target_os = "watchos"))] | ||
| pub fn get_name() -> Option<CString> { | ||
| let mut name = vec![0u8; libc::MAXTHREADNAMESIZE]; | ||
| let res = unsafe { | ||
| libc::pthread_getname_np(libc::pthread_self(), name.as_mut_ptr().cast(), name.len()) | ||
| }; | ||
| if res != 0 { | ||
| return None; | ||
| } | ||
| name.truncate(name.iter().position(|&c| c == 0)?); | ||
| CString::new(name).ok() | ||
| } | ||
|
|
||
| #[cfg(target_os = "haiku")] | ||
| pub fn get_name() -> Option<CString> { | ||
| unsafe { | ||
| let mut tinfo = mem::MaybeUninit::<libc::thread_info>::uninit(); | ||
| // See BeOS teams group and threads api. | ||
| // https://www.haiku-os.org/legacy-docs/bebook/TheKernelKit_ThreadsAndTeams_Overview.html | ||
| let thread_self = libc::find_thread(ptr::null_mut()); | ||
| let res = libc::get_thread_info(thread_self, tinfo.as_mut_ptr()); | ||
| if res != libc::B_OK { | ||
| return None; | ||
| } | ||
| let info = tinfo.assume_init(); | ||
| let name = | ||
| core::slice::from_raw_parts(info.name.as_ptr() as *const u8, info.name.len()); | ||
| CStr::from_bytes_until_nul(name).map(CStr::to_owned).ok() | ||
| } | ||
| } | ||
|
|
||
| #[cfg(not(any( | ||
| target_os = "linux", | ||
| target_os = "freebsd", | ||
| target_os = "netbsd", | ||
| target_os = "macos", | ||
| target_os = "ios", | ||
| target_os = "tvos", | ||
| target_os = "watchos", | ||
| target_os = "haiku", | ||
| target_os = "solaris", | ||
| target_os = "illumos" | ||
| )))] | ||
| pub fn get_name() -> Option<CString> { | ||
| None | ||
| } |
There was a problem hiding this comment.
...tbh, this complexity alone makes me question the decision to start down this path, but you could not have foreseen this.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
|
IIUC this will also need a beta backport |
|
Oh right, yeah beta forked after that PR. I'll need to create a new PR though as this one won't backport cleanly. I'll open a PR against the beta branch and beta nominate it. |
workingjubilee
added a commit
to workingjubilee/rustc
that referenced
this pull request
Apr 5, 2024
…ngjubilee Revert "Use OS thread name by default" This reverts rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) due to rust-lang#123495 (Thread names are not always valid UTF-8). It's not a direct revert because there have been other changes since that PR.
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 5, 2024
…llaumeGomez Rollup of 8 pull requests Successful merges: - rust-lang#121419 (Add aarch64-apple-visionos and aarch64-apple-visionos-sim tier 3 targets) - rust-lang#123159 (Fix target-cpu fpu features on Arm R/M-profile) - rust-lang#123487 (CFI: Restore typeid_for_instance default behavior) - rust-lang#123500 (Revert removing miri jobserver workaround) - rust-lang#123505 (Revert "Use OS thread name by default") - rust-lang#123509 (Add jieyouxu to compiler review rotation and as a reviewer for `tests/run-make`, `src/tools/run-make-support` and `src/tools/compiletest`) - rust-lang#123514 (Fix typo in `compiler/rustc_middle/src/traits/solve/inspect.rs`) - rust-lang#123515 (Use `include` command to reduce code duplication) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 6, 2024
Rollup merge of rust-lang#123505 - ChrisDenton:revert-121666, r=workingjubilee Revert "Use OS thread name by default" This reverts rust-lang#121666 (Use the OS thread name by default if `THREAD_INFO` has not been initialized) due to rust-lang#123495 (Thread names are not always valid UTF-8). It's not a direct revert because there have been other changes since that PR.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 14, 2024
…mulacrum Add missing `unsafe` to some internal `std` functions Adds `unsafe` to a few internal functions that have safety requirements but were previously not marked as `unsafe`. Specifically: - `std::sys::pal::unix::thread::min_stack_size` needs to be `unsafe` as `__pthread_get_minstack` might dereference the passed pointer. All callers currently pass a valid initialised `libc::pthread_attr_t`. - `std::thread::Thread::new` (and `new_inner`) need to be `unsafe` as it requires the passed thread name to be valid UTF-8, otherwise `Thread::name` will trigger undefined behaviour. I've taken the opportunity to split out the unnamed thread case into a separate `new_unnamed` function to make the safety requirement clearer. All callers meet the safety requirement now that rust-lang#123505 has been merged.
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Apr 14, 2024
…mulacrum Add missing `unsafe` to some internal `std` functions Adds `unsafe` to a few internal functions that have safety requirements but were previously not marked as `unsafe`. Specifically: - `std::sys::pal::unix::thread::min_stack_size` needs to be `unsafe` as `__pthread_get_minstack` might dereference the passed pointer. All callers currently pass a valid initialised `libc::pthread_attr_t`. - `std::thread::Thread::new` (and `new_inner`) need to be `unsafe` as it requires the passed thread name to be valid UTF-8, otherwise `Thread::name` will trigger undefined behaviour. I've taken the opportunity to split out the unnamed thread case into a separate `new_unnamed` function to make the safety requirement clearer. All callers meet the safety requirement now that rust-lang#123505 has been merged.
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Apr 14, 2024
Rollup merge of rust-lang#123879 - beetrees:missing-unsafe, r=Mark-Simulacrum Add missing `unsafe` to some internal `std` functions Adds `unsafe` to a few internal functions that have safety requirements but were previously not marked as `unsafe`. Specifically: - `std::sys::pal::unix::thread::min_stack_size` needs to be `unsafe` as `__pthread_get_minstack` might dereference the passed pointer. All callers currently pass a valid initialised `libc::pthread_attr_t`. - `std::thread::Thread::new` (and `new_inner`) need to be `unsafe` as it requires the passed thread name to be valid UTF-8, otherwise `Thread::name` will trigger undefined behaviour. I've taken the opportunity to split out the unnamed thread case into a separate `new_unnamed` function to make the safety requirement clearer. All callers meet the safety requirement now that rust-lang#123505 has been merged.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
This reverts #121666 (Use the OS thread name by default if
THREAD_INFOhas not been initialized) due to #123495 (Thread names are not always valid UTF-8).It's not a direct revert because there have been other changes since that PR.