Skip to content

Commit cbc88ca

Browse files
raphaelcohnraphaelcohn
committed
Adjustments for latest merge
2 parents bf5b72b + 1f870b8 commit cbc88ca

File tree

11 files changed

+39
-5
lines changed

11 files changed

+39
-5
lines changed

‎src/unix/bsd/apple/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -932,7 +932,10 @@ pub const _SC_TRACE_SYS_MAX: ::c_int = 129;
932932
pub const _SC_TRACE_USER_EVENT_MAX: ::c_int = 130;
933933
pub const _SC_PASS_MAX: ::c_int = 131;
934934

935+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
936+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
935937
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
938+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
936939
pub const _PTHREAD_MUTEX_SIG_init: ::c_long = 0x32AAABA7;
937940
pub const _PTHREAD_COND_SIG_init: ::c_long = 0x3CB0B1BB;
938941
pub const _PTHREAD_RWLOCK_SIG_init: ::c_long = 0x2DA8B3B4;

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

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -647,7 +647,11 @@ pub const _SC_HOST_NAME_MAX: ::c_int = 72;
647647
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
648648
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
649649
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
650+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
650651
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
652+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
653+
pub const PTHREAD_MUTEX_ADAPTIVE_NP: ::c_int = 4;
654+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_ERRORCHECK;
651655

652656
pub const SCHED_FIFO: ::c_int = 1;
653657
pub const SCHED_OTHER: ::c_int = 2;

‎src/unix/bsd/openbsdlike/bitrig.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -270,7 +270,12 @@ pub const ST_NOSUID: ::c_ulong = 2;
270270
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
271271
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
272272
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
273+
274+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
273275
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
276+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
277+
pub const PTHREAD_MUTEX_STRICT_NP: ::c_int = 4;
278+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_STRICT_NP;
274279

275280
pub const TMP_MAX : ::c_uint = 0x7fffffff;
276281

‎src/unix/bsd/openbsdlike/netbsd.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
345345
ptr_owner: 0,
346346
ptr_private: 0 as *mut _,
347347
};
348+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
349+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
348350
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
351+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
349352

350353
pub const EVFILT_AIO: ::int16_t = 2;
351354
pub const EVFILT_PROC: ::int16_t = 4;

‎src/unix/bsd/openbsdlike/openbsd.rs

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,12 @@ pub const ST_NOSUID: ::c_ulong = 2;
239239
pub const PTHREAD_MUTEX_INITIALIZER: pthread_mutex_t = 0 as *mut _;
240240
pub const PTHREAD_COND_INITIALIZER: pthread_cond_t = 0 as *mut _;
241241
pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = 0 as *mut _;
242+
243+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 1;
242244
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 2;
245+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 3;
246+
pub const PTHREAD_MUTEX_STRICT_NP: ::c_int = 4;
247+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_STRICT_NP;
243248

244249
pub const TMP_MAX : ::c_uint = 0x7fffffff;
245250

‎src/unix/notbsd/android/b32.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -122,6 +122,8 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
122122
__reserved: [0; 12],
123123
};
124124
pub const PTHREAD_STACK_MIN: ::size_t = 4096 * 2;
125+
pub const CPU_SETSIZE: ::size_t = 32;
126+
pub const __CPU_BITS: ::size_t = 32;
125127

126128
extern {
127129
pub fn timegm64(tm: *const ::tm) -> ::time64_t;

‎src/unix/notbsd/android/b64.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -132,6 +132,8 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
132132
__reserved: [0; 36],
133133
};
134134
pub const PTHREAD_STACK_MIN: ::size_t = 4096 * 4;
135+
pub const CPU_SETSIZE: ::size_t = 1024;
136+
pub const __CPU_BITS: ::size_t = 64;
135137

136138
extern {
137139
pub fn timegm(tm: *const ::tm) -> ::time64_t;

‎src/unix/notbsd/android/mod.rs

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,10 @@ pub const _SC_THREAD_PRIO_PROTECT: ::c_int = 84;
165165
pub const _SC_THREAD_SAFE_FUNCTIONS: ::c_int = 85;
166166
pub const _SC_NPROCESSORS_ONLN: ::c_int = 97;
167167

168+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
168169
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
170+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
171+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
169172

170173
pub const FIOCLEX: ::c_int = 0x5451;
171174

@@ -468,11 +471,6 @@ pub const RTLD_NOLOAD: ::c_int = 0x4;
468471
pub const RTLD_NOW: ::c_int = 0;
469472
pub const RTLD_DEFAULT: *mut ::c_void = -1isize as *mut ::c_void;
470473

471-
#[cfg(target_pointer_width = "64")] pub const CPU_SETSIZE: ::size_t = 1024;
472-
#[cfg(target_pointer_width = "32")] pub const CPU_SETSIZE: ::size_t = 32;
473-
#[cfg(target_pointer_width = "64")] pub const __CPU_BITS: ::size_t = 64;
474-
#[cfg(target_pointer_width = "32")] pub const __CPU_BITS: ::size_t = 32;
475-
476474
f! {
477475
pub fn sigemptyset(set: *mut sigset_t) -> ::c_int {
478476
*set = 0;

‎src/unix/notbsd/linux/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -401,7 +401,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
401401
__align: [],
402402
size: [0; __SIZEOF_PTHREAD_RWLOCK_T],
403403
};
404+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
404405
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 1;
406+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
407+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
405408
pub const __SIZEOF_PTHREAD_COND_T: usize = 48;
406409

407410
pub const SCHED_OTHER: ::c_int = 0;

‎src/unix/notbsd/linux/other/mod.rs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -499,6 +499,12 @@ extern {
499499
pub fn getpriority(which: ::__priority_which_t, who: ::id_t) -> ::c_int;
500500
pub fn setpriority(which: ::__priority_which_t, who: ::id_t,
501501
prio: ::c_int) -> ::c_int;
502+
pub fn pthread_getaffinity_np(thread: ::pthread_t,
503+
cpusetsize: ::size_t,
504+
cpuset: *mut ::cpu_set_t) -> ::c_int;
505+
pub fn pthread_setaffinity_np(thread: ::pthread_t,
506+
cpusetsize: ::size_t,
507+
cpuset: *const ::cpu_set_t) -> ::c_int;
502508
}
503509

504510
cfg_if! {

‎src/unix/solaris/mod.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -831,7 +831,10 @@ pub const PTHREAD_RWLOCK_INITIALIZER: pthread_rwlock_t = pthread_rwlock_t {
831831
__pthread_rwlock_readercv: PTHREAD_COND_INITIALIZER,
832832
__pthread_rwlock_writercv: PTHREAD_COND_INITIALIZER
833833
};
834+
pub const PTHREAD_MUTEX_NORMAL: ::c_int = 0;
835+
pub const PTHREAD_MUTEX_ERRORCHECK: ::c_int = 2;
834836
pub const PTHREAD_MUTEX_RECURSIVE: ::c_int = 4;
837+
pub const PTHREAD_MUTEX_DEFAULT: ::c_int = PTHREAD_MUTEX_NORMAL;
835838

836839
f! {
837840
pub fn FD_CLR(fd: ::c_int, set: *mut fd_set) -> () {

0 commit comments

Comments
 (0)