Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-04-27 18:57:42 +03:00
Code Issues Packages Projects Releases Wiki Activity

Rollup merge of #135991 - no1wudi:master, r=thomcc

Browse Source 
Fix set_name in thread mod for NuttX

Replace `pthread_set_name_np` with `pthread_setname_np` for NuttX in the `set_name` function, this change aligns the implementation with the correct API available on NuttX

This patch ensures thread naming works correctly on NuttX platforms.

See also:
https://github.com/rust-lang/libc/blob/0f9f8c91adb0365c0d13b34ec27ac8019818cf1f/src/unix/nuttx/mod.rs#L562
https://github.com/apache/nuttx/blob/8f3a2a6f7645dd95b6a7608b9cde3cb693b118c2/include/pthread.h#L511-L514
This commit is contained in:
Matthias Krüger
2025-01-25 08:03:35 +01:00
committed by GitHub
parent eb3e1c9ee1 e170c9dec0
commit 7a79024ef4
1 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
library/std/src/sys/pal/unix/thread.rs
+8 -3
View File
@@ -130,7 +130,12 @@ pub fn set_name(name: &CStr) {
}
}
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly"))]
#[cfg(any(
target_os = "linux",
target_os = "freebsd",
target_os = "dragonfly",
target_os = "nuttx"
))]
pub fn set_name(name: &CStr) {
unsafe {
cfg_if::cfg_if! {
@@ -139,7 +144,7 @@ pub fn set_name(name: &CStr) {
const TASK_COMM_LEN: usize = 16;
let name = truncate_cstr::<{ TASK_COMM_LEN }>(name);
} else {
// FreeBSD and DragonFly BSD do not enforce length limits.
// FreeBSD, DragonFly, FreeBSD and NuttX do not enforce length limits.
}
};
// Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20 for Linux,
@@ -150,7 +155,7 @@ pub fn set_name(name: &CStr) {
}
}
#[cfg(any(target_os = "openbsd", target_os = "nuttx"))]
#[cfg(target_os = "openbsd")]
pub fn set_name(name: &CStr) {
unsafe {
libc::pthread_set_name_np(libc::pthread_self(), name.as_ptr());