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

Auto merge of #2626 - RalfJung:pthread_setname_np, r=RalfJung

Browse Source 
pthread_setname_np returns an int on macOS

Fixes https://github.com/rust-lang/miri/issues/2625
This commit is contained in:
bors 2022-10-28 08:32:23 +00:00
commit 3321c2d3e7
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/tools/miri/src/shims/unix/macos/foreign_items.rs
View File

@ -177,11 +177,14 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
let [name] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?; let [name] = this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
let thread = this.pthread_self()?; let thread = this.pthread_self()?;
let max_len = this.eval_libc("MAXTHREADNAMESIZE")?.to_machine_usize(this)?; let max_len = this.eval_libc("MAXTHREADNAMESIZE")?.to_machine_usize(this)?;
this.pthread_setname_np( let res = this.pthread_setname_np(
thread, thread,
this.read_scalar(name)?, this.read_scalar(name)?,
max_len.try_into().unwrap(), max_len.try_into().unwrap(),
)?; )?;
// Contrary to the manpage, `pthread_setname_np` on macOS still
// returns an integer indicating success.
this.write_scalar(res, dest)?;
} }
"pthread_getname_np" => { "pthread_getname_np" => {
let [thread, name, len] = let [thread, name, len] =

18
src/tools/miri/tests/pass-dep/shims/pthreads.rs
View File

@ -1,6 +1,6 @@
//@ignore-target-windows: No libc on Windows //@ignore-target-windows: No libc on Windows
#![feature(cstr_from_bytes_until_nul)] #![feature(cstr_from_bytes_until_nul)]
use std::ffi::CStr; use std::ffi::{CStr, CString};
use std::thread; use std::thread;
fn main() { fn main() {
@ -135,6 +135,13 @@ fn test_named_thread_truncation() {
.chain(std::iter::repeat(" yada").take(100)) .chain(std::iter::repeat(" yada").take(100))
.collect::<String>(); .collect::<String>();
fn set_thread_name(name: &CStr) -> i32 {
#[cfg(target_os = "linux")]
return unsafe { libc::pthread_setname_np(libc::pthread_self(), name.as_ptr().cast()) };
#[cfg(target_os = "macos")]
return unsafe { libc::pthread_setname_np(name.as_ptr().cast()) };
}
let result = thread::Builder::new().name(long_name.clone()).spawn(move || { let result = thread::Builder::new().name(long_name.clone()).spawn(move || {
// Rust remembers the full thread name itself. // Rust remembers the full thread name itself.
assert_eq!(thread::current().name(), Some(long_name.as_str())); assert_eq!(thread::current().name(), Some(long_name.as_str()));
@ -142,11 +149,16 @@ fn test_named_thread_truncation() {
// But the system is limited -- make sure we successfully set a truncation. // But the system is limited -- make sure we successfully set a truncation.
let mut buf = vec![0u8; long_name.len() + 1]; let mut buf = vec![0u8; long_name.len() + 1];
unsafe { unsafe {
libc::pthread_getname_np(libc::pthread_self(), buf.as_mut_ptr().cast(), buf.len()); libc::pthread_getname_np(libc::pthread_self(), buf.as_mut_ptr().cast(), buf.len())
} };
let cstr = CStr::from_bytes_until_nul(&buf).unwrap(); let cstr = CStr::from_bytes_until_nul(&buf).unwrap();
assert!(cstr.to_bytes().len() >= 15); // POSIX seems to promise at least 15 chars assert!(cstr.to_bytes().len() >= 15); // POSIX seems to promise at least 15 chars
assert!(long_name.as_bytes().starts_with(cstr.to_bytes())); assert!(long_name.as_bytes().starts_with(cstr.to_bytes()));
// Also test directly calling pthread_setname to check its return value.
assert_eq!(set_thread_name(&cstr), 0);
// But with a too long name it should fail.
assert_ne!(set_thread_name(&CString::new(long_name).unwrap()), 0);
}); });
result.unwrap().join().unwrap(); result.unwrap().join().unwrap();
} }