Add pthread_mutexattr_setprotocol and pthread_mutexattr_getprotocol o…

…n Linux-like platforms Include the PTHREAD_PRIO_* constants. Android does not define PTHREAD_PRIO_PROTECT.
rust-lang · Mar 22, 2022 · 3830d48 · 3830d48
1 parent a9176ca
commit 3830d48
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 0 deletions.
diff --git a/libc-test/semver/android.txt b/libc-test/semver/android.txt
@@ -1659,6 +1659,8 @@ PTHREAD_MUTEX_ERRORCHECK
 PTHREAD_MUTEX_INITIALIZER
 PTHREAD_MUTEX_NORMAL
 PTHREAD_MUTEX_RECURSIVE
+PTHREAD_PRIO_NONE
+PTHREAD_PRIO_INHERIT
 PTHREAD_RWLOCK_INITIALIZER
 PTHREAD_STACK_MIN
 PTRACE_ATTACH
@@ -3040,8 +3042,10 @@ pthread_mutex_timedlock
 pthread_mutex_trylock
 pthread_mutex_unlock
 pthread_mutexattr_destroy
+pthread_mutexattr_getprotocol
 pthread_mutexattr_getpshared
 pthread_mutexattr_init
+pthread_mutexattr_setprotocol
 pthread_mutexattr_setpshared
 pthread_mutexattr_settype
 pthread_mutexattr_t

diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt
@@ -1653,6 +1653,9 @@ PTHREAD_CREATE_DETACHED
 PTHREAD_CREATE_JOINABLE
 PTHREAD_MUTEX_DEFAULT
 PTHREAD_MUTEX_ERRORCHECK
+PTHREAD_PRIO_NONE
+PTHREAD_PRIO_INHERIT
+PTHREAD_PRIO_PROTECT
 PTHREAD_PROCESS_PRIVATE
 PTHREAD_PROCESS_SHARED
 PTHREAD_STACK_MIN
@@ -2951,7 +2954,9 @@ pthread_getschedparam
 pthread_kill
 pthread_mutex_consistent
 pthread_mutex_timedlock
+pthread_mutexattr_getprotocol
 pthread_mutexattr_getpshared
+pthread_mutexattr_setprotocol
 pthread_mutexattr_setpshared
 pthread_mutexattr_getrobust
 pthread_mutexattr_setrobust

diff --git a/src/unix/linux_like/emscripten/mod.rs b/src/unix/linux_like/emscripten/mod.rs
@@ -915,6 +915,7 @@ pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
 pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
 pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
 pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
+pub const PTHREAD_PRIO_PROTECT: ::c_int = 2;
 pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0;
 pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
 pub const __SIZEOF_PTHREAD_COND_T: usize = 48;

diff --git a/src/unix/linux_like/linux/mod.rs b/src/unix/linux_like/linux/mod.rs
@@ -1519,6 +1519,7 @@ pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
 pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
 pub const PTHREAD_MUTEX_STALLED: ::c_int = 0;
 pub const PTHREAD_MUTEX_ROBUST: ::c_int = 1;
+pub const PTHREAD_PRIO_PROTECT: ::c_int = 2;
 pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0;
 pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
 pub const __SIZEOF_PTHREAD_COND_T: usize = 48;

diff --git a/src/unix/linux_like/mod.rs b/src/unix/linux_like/mod.rs
@@ -487,6 +487,8 @@ pub const SIGTRAP: ::c_int = 5;
 
 pub const PTHREAD_CREATE_JOINABLE: ::c_int = 0;
 pub const PTHREAD_CREATE_DETACHED: ::c_int = 1;
+pub const PTHREAD_PRIO_NONE: ::c_int = 0;
+pub const PTHREAD_PRIO_INHERIT: ::c_int = 1;
 
 pub const CLOCK_REALTIME: ::clockid_t = 0;
 pub const CLOCK_MONOTONIC: ::clockid_t = 1;
@@ -1712,6 +1714,14 @@ extern "C" {
         attr: *mut pthread_condattr_t,
         clock_id: ::clockid_t,
     ) -> ::c_int;
+    pub fn pthread_mutexattr_getprotocol(
+        attr: *const pthread_mutexattr_t,
+        protocol: *mut ::c_int,
+    ) -> ::c_int;
+    pub fn pthread_mutexattr_setprotocol(
+        attr: *mut pthread_mutexattr_t,
+        protocol: ::c_int,
+    ) -> ::c_int;
     pub fn pthread_condattr_setpshared(attr: *mut pthread_condattr_t, pshared: ::c_int) -> ::c_int;
     pub fn pthread_mutexattr_setpshared(
         attr: *mut pthread_mutexattr_t,