mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

std:🧵 set_name change for solaris/illumos.

Browse Source 
truncate down to 32 (31 + 1) for solaris/illumos.
This commit is contained in:
David Carlier 2024-04-01 14:28:37 +01:00
parent 3d5528c287
commit ca36fe310e
No known key found for this signature in database
GPG Key ID: CEF290BB40D2086B
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
library/std/src/sys/pal/unix/thread.rs
View File

@ -182,8 +182,11 @@ fn pthread_setname_np(
if let Some(f) = pthread_setname_np.get() { if let Some(f) = pthread_setname_np.get() {
#[cfg(target_os = "nto")] #[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()) }; let res = unsafe { f(libc::pthread_self(), name.as_ptr()) };
debug_assert_eq!(res, 0); debug_assert_eq!(res, 0);
} }
@ -360,6 +363,8 @@ fn drop(&mut self) {
target_os = "tvos", target_os = "tvos",
target_os = "watchos", target_os = "watchos",
target_os = "nto", 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] { fn truncate_cstr<const MAX_WITH_NUL: usize>(cstr: &CStr) -> [libc::c_char; MAX_WITH_NUL] {
let mut result = [0; MAX_WITH_NUL]; let mut result = [0; MAX_WITH_NUL];