diff options
| author | bors <bors@rust-lang.org> | 2022-04-24 16:53:38 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-04-24 16:53:38 +0000 |
| commit | f6df53fd694f6fc903058c765efc10d77725b31b (patch) | |
| tree | 47b3074e41524c7d86388dda3e71fa5aa44f2c32 | |
| parent | 40d529fdff03c58f64d08b54c7b730c4b2fa2f98 (diff) | |
| parent | 91395aec785de89086a208c01aacc8336f8a9704 (diff) | |
| download | rust-libc-f6df53fd694f6fc903058c765efc10d77725b31b.tar.gz | |
Auto merge of #2731 - rtzoeller:pthread_prio_inherit, r=Amanieu
Add pthread_mutexattr_setprotocol and pthread_mutexattr_getprotocol on Linux
Include the PTHREAD_PRIO_* constants.
| -rw-r--r-- | libc-test/semver/linux.txt | 5 | ||||
| -rw-r--r-- | src/unix/linux_like/linux/mod.rs | 11 |
2 files changed, 16 insertions, 0 deletions
diff --git a/libc-test/semver/linux.txt b/libc-test/semver/linux.txt index 9eb096efe8..a548a3f44f 100644 --- 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/linux/mod.rs b/src/unix/linux_like/linux/mod.rs index 64d293e2c8..231b816711 100644 --- a/src/unix/linux_like/linux/mod.rs +++ b/src/unix/linux_like/linux/mod.rs @@ -1519,6 +1519,9 @@ 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_NONE: ::c_int = 0; +pub const PTHREAD_PRIO_INHERIT: ::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; @@ -3788,6 +3791,14 @@ extern "C" { timeout: *const ::timespec, sigmask: *const sigset_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_mutex_consistent(mutex: *mut pthread_mutex_t) -> ::c_int; pub fn pthread_mutex_timedlock( lock: *mut pthread_mutex_t, |