Skip to content

Rollup of 2 pull requests #123346

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
merged 4 commits into from
Apr 2, 2024
Merged

Rollup of 2 pull requests #123346

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
652f6f7
Pass RUST_BACKTRACE when running docker.
jfgoog Apr 1, 2024
ca36fe3
std::thread: set_name change for solaris/illumos.
devnexen Apr 1, 2024
48b2a51
Rollup merge of #123323 - devnexen:thread_set_name_solaris_fix, r=wor…
workingjubilee Apr 2, 2024
347c579
Rollup merge of #123330 - jfgoog:pass-backtrace, r=Kobzol
workingjubilee Apr 2, 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
Prev Previous commit
Next Next commit
std::thread: set_name change for solaris/illumos. 
truncate down to 32 (31 + 1) for solaris/illumos.
  • Loading branch information
@devnexen
devnexen committed Apr 1, 2024
commit ca36fe310e8970a66461ff7fc8496a76c75b70ed
7 changes: 6 additions & 1 deletion library/std/src/sys/pal/unix/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,11 @@ impl Thread {

if let Some(f) = pthread_setname_np.get() {
#[cfg(target_os = "nto")]
let name = truncate_cstr::<{ libc::_NTO_THREAD_NAME_MAX as usize }>(name);
const THREAD_NAME_MAX: usize = libc::_NTO_THREAD_NAME_MAX as usize;
#[cfg(any(target_os = "solaris", target_os = "illumos"))]
const THREAD_NAME_MAX: usize = 32;

let name = truncate_cstr::<{ THREAD_NAME_MAX }>(name);
let res = unsafe { f(libc::pthread_self(), name.as_ptr()) };
debug_assert_eq!(res, 0);
}
Expand Down Expand Up @@ -360,6 +363,8 @@ impl Drop for Thread {
target_os = "tvos",
target_os = "watchos",
target_os = "nto",
target_os = "solaris",
target_os = "illumos",
))]
fn truncate_cstr<const MAX_WITH_NUL: usize>(cstr: &CStr) -> [libc::c_char; MAX_WITH_NUL] {
let mut result = [0; MAX_WITH_NUL];
Expand Down