let freebsd truncates itself the id name

rust-lang · Oct 27, 2023 · 809057d · 809057d
1 parent 2117ef5
commit 809057d
Show file tree

Hide file tree

Showing 3 changed files with 70 additions and 59 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/shims/unix/freebsd/foreign_items.rs b/src/shims/unix/freebsd/foreign_items.rs
@@ -30,11 +30,7 @@ pub trait EvalContextExt<'mir, 'tcx: 'mir>: crate::MiriInterpCxExt<'mir, 'tcx> {
             "pthread_set_name_np" => {
                 let [thread, name] =
                     this.check_shim(abi, Abi::C { unwind: false }, link_name, args)?;
-                // freebsd silently truncates to MAXCOMLEN (+ 1).
-                //
-                // ref. https://github.com/freebsd/freebsd-src/blob/314542de6d0a044640d349d68b2d1a1fe5f427ff/sys/sys/param.h#L127
-                // ref. https://github.com/freebsd/freebsd-src/blob/314542de6d0a044640d349d68b2d1a1fe5f427ff/lib/libc/sys/thr_set_name.2#L47
-                let max_len = usize::MAX; //20;
+                let max_len = usize::MAX;
                 this.pthread_setname_np(
                     this.read_scalar(thread)?,
                     this.read_scalar(name)?,

diff --git a/tests/pass-dep/shims/pthreads.rs b/tests/pass-dep/shims/pthreads.rs
@@ -1,5 +1,7 @@
 //@ignore-target-windows: No libc on Windows
-use std::ffi::{CStr, CString};
+use std::ffi::CStr;
+#[cfg(not(target_os = "freebsd"))]
+use std::ffi::CString;
 use std::thread;
 
 fn main() {
@@ -176,6 +178,7 @@ fn test_named_thread_truncation() {
         // 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.
+        #[cfg(not(target_os = "freebsd"))]
         assert_ne!(set_thread_name(&CString::new(long_name).unwrap()), 0);
     });
     result.unwrap().join().unwrap();