diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2025-01-25 08:03:35 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-01-25 08:03:35 +0100 |
| commit | 7a79024ef477942102bf1a7df9d4c69b4b0d6a2b (patch) | |
| tree | 4359a73adbbd2c3dd341dd5bf162c05bdbc29da9 | |
| parent | eb3e1c9ee1f55dff0ba7a99e995814d73adefedc (diff) | |
| parent | e170c9dec043e8f51bf1dfd3709f25e9bbe5a0fd (diff) | |
| download | rust-7a79024ef477942102bf1a7df9d4c69b4b0d6a2b.tar.gz rust-7a79024ef477942102bf1a7df9d4c69b4b0d6a2b.zip | |
Rollup merge of #135991 - no1wudi:master, r=thomcc
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
| -rw-r--r-- | library/std/src/sys/pal/unix/thread.rs | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/library/std/src/sys/pal/unix/thread.rs b/library/std/src/sys/pal/unix/thread.rs index f657f82e6e3..356669980c7 100644 --- a/library/std/src/sys/pal/unix/thread.rs +++ b/library/std/src/sys/pal/unix/thread.rs @@ -130,7 +130,12 @@ impl Thread { } } - #[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 @@ impl Thread { 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 @@ impl Thread { } } - #[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()); |
