Skip to content

Commit f6df53f

Browse files
committed
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.
2 parents 40d529f + 91395ae commit f6df53f

File tree

2 files changed

+16
-0
lines changed

2 files changed

+16
-0
lines changed

libc-test/semver/linux.txt

+5
Original file line numberDiff line numberDiff line change
@@ -1653,6 +1653,9 @@ PTHREAD_CREATE_DETACHED
16531653
PTHREAD_CREATE_JOINABLE
16541654
PTHREAD_MUTEX_DEFAULT
16551655
PTHREAD_MUTEX_ERRORCHECK
1656+
PTHREAD_PRIO_NONE
1657+
PTHREAD_PRIO_INHERIT
1658+
PTHREAD_PRIO_PROTECT
16561659
PTHREAD_PROCESS_PRIVATE
16571660
PTHREAD_PROCESS_SHARED
16581661
PTHREAD_STACK_MIN
@@ -2951,7 +2954,9 @@ pthread_getschedparam
29512954
pthread_kill
29522955
pthread_mutex_consistent
29532956
pthread_mutex_timedlock
2957+
pthread_mutexattr_getprotocol
29542958
pthread_mutexattr_getpshared
2959+
pthread_mutexattr_setprotocol
29552960
pthread_mutexattr_setpshared
29562961
pthread_mutexattr_getrobust
29572962
pthread_mutexattr_setrobust

src/unix/linux_like/linux/mod.rs

+11
Original file line numberDiff line numberDiff line change
@@ -1519,6 +1519,9 @@ pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
15191519
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
15201520
pub const PTHREAD_MUTEX_STALLED: ::c_int = 0;
15211521
pub const PTHREAD_MUTEX_ROBUST: ::c_int = 1;
1522+
pub const PTHREAD_PRIO_NONE: ::c_int = 0;
1523+
pub const PTHREAD_PRIO_INHERIT: ::c_int = 1;
1524+
pub const PTHREAD_PRIO_PROTECT: ::c_int = 2;
15221525
pub const PTHREAD_PROCESS_PRIVATE: ::c_int = 0;
15231526
pub const PTHREAD_PROCESS_SHARED: ::c_int = 1;
15241527
pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
@@ -3788,6 +3791,14 @@ extern "C" {
37883791
timeout: *const ::timespec,
37893792
sigmask: *const sigset_t,
37903793
) -> ::c_int;
3794+
pub fn pthread_mutexattr_getprotocol(
3795+
attr: *const pthread_mutexattr_t,
3796+
protocol: *mut ::c_int,
3797+
) -> ::c_int;
3798+
pub fn pthread_mutexattr_setprotocol(
3799+
attr: *mut pthread_mutexattr_t,
3800+
protocol: ::c_int,
3801+
) -> ::c_int;
37913802
pub fn pthread_mutex_consistent(mutex: *mut pthread_mutex_t) -> ::c_int;
37923803
pub fn pthread_mutex_timedlock(
37933804
lock: *mut pthread_mutex_t,

0 commit comments

Comments
 (0)