Skip to content

prctl instead of pthread on linux for name setup #23640

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bors merged 1 commit into from
Mar 24, 2015
Merged

prctl instead of pthread on linux for name setup #23640

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 8 additions & 11 deletions src/libstd/sys/unix/thread.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,19 +227,16 @@ pub unsafe fn create(stack: usize, p: Thunk) -> io::Result<rust_thread> {

#[cfg(any(target_os = "linux", target_os = "android"))]
pub unsafe fn set_name(name: &str) {
// pthread_setname_np() since glibc 2.12
// availability autodetected via weak linkage
type F = unsafe extern fn(libc::pthread_t, *const libc::c_char)
-> libc::c_int;
// pthread wrapper only appeared in glibc 2.12, so we use syscall directly.
extern {
#[linkage = "extern_weak"]
static pthread_setname_np: *const ();
}
if !pthread_setname_np.is_null() {
let cname = CString::new(name).unwrap();
mem::transmute::<*const (), F>(pthread_setname_np)(pthread_self(),
cname.as_ptr());
fn prctl(option: libc::c_int, arg2: libc::c_ulong, arg3: libc::c_ulong,
arg4: libc::c_ulong, arg5: libc::c_ulong) -> libc::c_int;
}
const PR_SET_NAME: libc::c_int = 15;
let cname = CString::new(name).unwrap_or_else(|_| {
panic!("thread name may not contain interior null bytes")
});
prctl(PR_SET_NAME, cname.as_ptr() as libc::c_ulong, 0, 0, 0);
}

#[cfg(any(target_os = "freebsd",
Expand Down