Auto merge of #2246 - devnexen:remaining_pthread_spinlock_impls, r=JohnTitor

pthread_spinlock api remaining bsd systems

Author: bors

libc-test/build.rs

@@ -1099,6 +1099,8 @@ fn test_netbsd(target: &str) {
             // conflicting with `p_type` macro from <resolve.h>.
             ("Elf32_Phdr", "p_type") => true,
             ("Elf64_Phdr", "p_type") => true,
+            // pthread_spin_t is a volatile uchar
+            ("pthread_spinlock_t", "pts_spin") => true,
             _ => false,
         }
     });

libc-test/semver/android.txt

@@ -3001,6 +3001,12 @@ pthread_self
 pthread_setschedparam
 pthread_setspecific
 pthread_sigmask
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 pthread_t
 ptrace
 ptrdiff_t

libc-test/semver/dragonfly.txt

@@ -1307,6 +1307,12 @@ pthread_mutexattr_setpshared
 pthread_rwlockattr_getpshared
 pthread_rwlockattr_setpshared
 pthread_set_name_np
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 ptrace
 ptrace_io_desc
 pututxline

libc-test/semver/freebsd.txt

@@ -1558,6 +1558,12 @@ pthread_rwlockattr_getpshared
 pthread_rwlockattr_setpshared
 pthread_setaffinity_np
 pthread_set_name_np
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 ptrace
 ptrace_io_desc
 ptrace_vm_entry

libc-test/semver/linux.txt

@@ -2913,6 +2913,12 @@ pthread_rwlockattr_setpshared
 pthread_setaffinity_np
 pthread_setschedparam
 pthread_setschedprio
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 ptrace
 ptsname_r
 pwrite64

libc-test/semver/netbsd.txt

@@ -1205,6 +1205,12 @@ pthread_getattr_np
 pthread_getaffinity_np
 pthread_kill
 pthread_mutex_timedlock
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 pthread_setaffinity_np
 pthread_setname_np
 ptrace

libc-test/semver/openbsd.txt

@@ -1008,6 +1008,12 @@ pthread_kill
 pthread_main_np
 pthread_mutex_timedlock
 pthread_set_name_np
+pthread_spin_destroy
+pthread_spin_init
+pthread_spin_lock
+pthread_spin_trylock
+pthread_spin_unlock
+pthread_spinlock_t
 pthread_stackseg_np
 ptrace
 ptrace_io_desc

src/unix/bsd/freebsdlike/dragonfly/mod.rs

@@ -26,6 +26,8 @@ pub type cpuset_t = cpumask_t;
 pub type cpu_set_t = cpumask_t;
 
 pub type register_t = ::c_long;
+pub type umtx_t = ::c_int;
+pub type pthread_spinlock_t = ::uintptr_t;
 
 #[cfg_attr(feature = "extra_traits", derive(Debug))]
 pub enum sem {}
@@ -1269,6 +1271,12 @@ extern "C" {
         needle: *const ::c_void,
         needlelen: ::size_t,
     ) -> *mut ::c_void;
+    pub fn pthread_spin_init(lock: *mut pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut pthread_spinlock_t) -> ::c_int;
+
     pub fn sched_getaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *mut cpu_set_t) -> ::c_int;
     pub fn sched_setaffinity(pid: ::pid_t, cpusetsize: ::size_t, mask: *const cpu_set_t)
         -> ::c_int;

src/unix/bsd/netbsdlike/mod.rs

@@ -712,6 +712,11 @@ extern "C" {
         lock: *mut pthread_mutex_t,
         abstime: *const ::timespec,
     ) -> ::c_int;
+    pub fn pthread_spin_init(lock: *mut pthread_spinlock_t, pshared: ::c_int) -> ::c_int;
+    pub fn pthread_spin_destroy(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_lock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_trylock(lock: *mut pthread_spinlock_t) -> ::c_int;
+    pub fn pthread_spin_unlock(lock: *mut pthread_spinlock_t) -> ::c_int;
     pub fn pipe2(fds: *mut ::c_int, flags: ::c_int) -> ::c_int;
 
     pub fn getgrouplist(

src/unix/bsd/netbsdlike/netbsd/mod.rs

@@ -12,6 +12,7 @@ pub type lwpid_t = ::c_uint;
 pub type shmatt_t = ::c_uint;
 pub type cpuid_t = u64;
 pub type cpuset_t = _cpuset;
+pub type pthread_spin_t = ::c_uchar;
 
 // elf.h
 
@@ -209,6 +210,12 @@ s! {
         ptr_private: *mut ::c_void,
     }
 
+    pub struct pthread_spinlock_t {
+        pts_magic: ::c_uint,
+        pts_spin: ::pthread_spin_t,
+        pts_flags: ::c_int,
+    }
+
     pub struct kevent {
         pub ident: ::uintptr_t,
         pub filter: u32,
@@ -2067,6 +2074,7 @@ extern "C" {
         size: ::size_t,
         set: *mut cpuset_t,
     ) -> ::c_int;
+
     pub fn _cpuset_create() -> *mut cpuset_t;
     pub fn _cpuset_destroy(set: *mut cpuset_t);
     pub fn _cpuset_clr(cpu: cpuid_t, set: *mut cpuset_t) -> ::c_int;