Skip to content

Commit ce4fd90

Browse files
committed
Used pthread name functions returning result for FreeBSD and DragonFly
1 parent 45089ec commit ce4fd90

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

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

+12-11
Original file line numberDiff line numberDiff line change
@@ -129,25 +129,26 @@ impl Thread {
129129
}
130130
}
131131

132-
#[cfg(target_os = "linux")]
132+
#[cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly"))]
133133
pub fn set_name(name: &CStr) {
134-
const TASK_COMM_LEN: usize = 16;
135-
136134
unsafe {
137-
// Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20.
138-
let name = truncate_cstr::<{ TASK_COMM_LEN }>(name);
135+
cfg_if::cfg_if! {
136+
if #[cfg(target_os = "linux")] {
137+
const TASK_COMM_LEN: usize = 16;
138+
let name = &truncate_cstr::<{ TASK_COMM_LEN }>(name);
139+
} else {
140+
let name = name.to_bytes();
141+
}
142+
};
143+
// Available since glibc 2.12, musl 1.1.16, and uClibc 1.0.20 for Linux,
144+
// FreeBSD 12.2 and 13.0, and DragonFlyBSD 6.0.
139145
let res = libc::pthread_setname_np(libc::pthread_self(), name.as_ptr());
140146
// We have no good way of propagating errors here, but in debug-builds let's check that this actually worked.
141147
debug_assert_eq!(res, 0);
142148
}
143149
}
144150

145-
#[cfg(any(
146-
target_os = "freebsd",
147-
target_os = "dragonfly",
148-
target_os = "openbsd",
149-
target_os = "nuttx"
150-
))]
151+
#[cfg(any(target_os = "openbsd", target_os = "nuttx"))]
151152
pub fn set_name(name: &CStr) {
152153
unsafe {
153154
libc::pthread_set_name_np(libc::pthread_self(), name.as_ptr());

0 commit comments

Comments
 (0)