Skip to content

Commit 31075bb

Browse files
committed
Auto merge of rust-lang#123346 - workingjubilee:rollup-ix9qpsi, r=workingjubilee
Rollup of 2 pull requests Successful merges: - rust-lang#123323 (std::thread: set_name change for solaris/illumos.) - rust-lang#123330 (Pass RUST_BACKTRACE when running docker.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents dd5e502 + 347c579 commit 31075bb

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

library/std/src/sys/pal/unix/thread.rs

+6-1
Original file line numberDiff line numberDiff line change
@@ -182,8 +182,11 @@ impl Thread {
182182

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

189+
let name = truncate_cstr::<{ THREAD_NAME_MAX }>(name);
187190
let res = unsafe { f(libc::pthread_self(), name.as_ptr()) };
188191
debug_assert_eq!(res, 0);
189192
}
@@ -368,6 +371,8 @@ impl Drop for Thread {
368371
target_os = "tvos",
369372
target_os = "watchos",
370373
target_os = "nto",
374+
target_os = "solaris",
375+
target_os = "illumos",
371376
))]
372377
fn truncate_cstr<const MAX_WITH_NUL: usize>(cstr: &CStr) -> [libc::c_char; MAX_WITH_NUL] {
373378
let mut result = [0; MAX_WITH_NUL];

src/ci/docker/run.sh

+1
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,7 @@ docker \
323323
--env GITHUB_ACTIONS \
324324
--env GITHUB_REF \
325325
--env GITHUB_STEP_SUMMARY="/checkout/obj/${SUMMARY_FILE}" \
326+
--env RUST_BACKTRACE \
326327
--env TOOLSTATE_REPO_ACCESS_TOKEN \
327328
--env TOOLSTATE_REPO \
328329
--env TOOLSTATE_PUBLISH \

0 commit comments

Comments
 (0)