Skip to content

Commit 9ee773c

Browse files
committed
Auto merge of #3330 - sunfishcode:sunfishcode/pthread-setguardsize, r=JohnTitor
Declare `pthread_attr_setguardsize` and `pthread_attr_getstacksize`. Declare `pthread_attr_setguardsize` and `pthread_attr_getstacksize` on all platforms which have `pthread_attr_getguardsize` and `pthread_attr_setstacksize`, respectively.
2 parents c393de3 + 7565803 commit 9ee773c

File tree

17 files changed

+23
-4
lines changed

17 files changed

+23
-4
lines changed

libc-test/semver/dragonfly.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1437,6 +1437,7 @@ pseudo_AF_XTP
14371437
pthread_attr_get_np
14381438
pthread_attr_getguardsize
14391439
pthread_attr_getstack
1440+
pthread_attr_setguardsize
14401441
pthread_barrierattr_destroy
14411442
pthread_barrierattr_getpshared
14421443
pthread_barrierattr_init

libc-test/semver/freebsd.txt

+1
Original file line numberDiff line numberDiff line change
@@ -2010,6 +2010,7 @@ pseudo_AF_XTP
20102010
pthread_attr_get_np
20112011
pthread_attr_getguardsize
20122012
pthread_attr_getstack
2013+
pthread_attr_setguardsize
20132014
pthread_barrierattr_destroy
20142015
pthread_barrierattr_getpshared
20152016
pthread_barrierattr_init

libc-test/semver/fuchsia.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1294,6 +1294,7 @@ ppoll
12941294
preadv
12951295
pthread_attr_getguardsize
12961296
pthread_attr_getstack
1297+
pthread_attr_setguardsize
12971298
pthread_cancel
12981299
pthread_condattr_getclock
12991300
pthread_condattr_setclock

libc-test/semver/linux.txt

+1
Original file line numberDiff line numberDiff line change
@@ -3333,6 +3333,7 @@ pread64
33333333
preadv
33343334
pthread_attr_getguardsize
33353335
pthread_attr_getstack
3336+
pthread_attr_setguardsize
33363337
pthread_cancel
33373338
pthread_condattr_getclock
33383339
pthread_condattr_getpshared

libc-test/semver/netbsd.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1425,6 +1425,7 @@ pseudo_AF_XTP
14251425
pthread_attr_get_np
14261426
pthread_attr_getguardsize
14271427
pthread_attr_getstack
1428+
pthread_attr_setguardsize
14281429
pthread_cancel
14291430
pthread_condattr_setclock
14301431
pthread_getattr_np

libc-test/semver/openbsd.txt

+1
Original file line numberDiff line numberDiff line change
@@ -1146,6 +1146,7 @@ pseudo_AF_RTIP
11461146
pseudo_AF_XTP
11471147
pthread_attr_getguardsize
11481148
pthread_attr_getstack
1149+
pthread_attr_setguardsize
11491150
pthread_cancel
11501151
pthread_condattr_setclock
11511152
pthread_get_name_np

libc-test/semver/unix.txt

+1
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@ protoent
671671
pselect
672672
pthread_attr_destroy
673673
pthread_attr_init
674+
pthread_attr_getstacksize
674675
pthread_attr_setdetachstate
675676
pthread_attr_setstacksize
676677
pthread_attr_t

src/fuchsia/mod.rs

+5
Original file line numberDiff line numberDiff line change
@@ -3687,6 +3687,10 @@ extern "C" {
36873687
pub fn pthread_exit(value: *mut ::c_void) -> !;
36883688
pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
36893689
pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
3690+
pub fn pthread_attr_getstacksize(
3691+
attr: *const ::pthread_attr_t,
3692+
stacksize: *mut ::size_t,
3693+
) -> ::c_int;
36903694
pub fn pthread_attr_setstacksize(attr: *mut ::pthread_attr_t, stack_size: ::size_t) -> ::c_int;
36913695
pub fn pthread_attr_setdetachstate(attr: *mut ::pthread_attr_t, state: ::c_int) -> ::c_int;
36923696
pub fn pthread_detach(thread: ::pthread_t) -> ::c_int;
@@ -4161,6 +4165,7 @@ extern "C" {
41614165
attr: *const ::pthread_attr_t,
41624166
guardsize: *mut ::size_t,
41634167
) -> ::c_int;
4168+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
41644169
pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int;
41654170
pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
41664171
pub fn umount2(target: *const ::c_char, flags: ::c_int) -> ::c_int;

src/unix/aix/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -2669,6 +2669,7 @@ extern "C" {
26692669
attr: *const ::pthread_attr_t,
26702670
guardsize: *mut ::size_t,
26712671
) -> ::c_int;
2672+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
26722673
pub fn pthread_attr_getschedparam(
26732674
attr: *const ::pthread_attr_t,
26742675
param: *mut sched_param,

src/unix/bsd/freebsdlike/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1590,6 +1590,7 @@ extern "C" {
15901590
attr: *const ::pthread_attr_t,
15911591
guardsize: *mut ::size_t,
15921592
) -> ::c_int;
1593+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
15931594
pub fn pthread_attr_getstack(
15941595
attr: *const ::pthread_attr_t,
15951596
stackaddr: *mut *mut ::c_void,

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

+1
Original file line numberDiff line numberDiff line change
@@ -2727,6 +2727,7 @@ extern "C" {
27272727
attr: *const ::pthread_attr_t,
27282728
guardsize: *mut ::size_t,
27292729
) -> ::c_int;
2730+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
27302731
pub fn pthread_attr_getstack(
27312732
attr: *const ::pthread_attr_t,
27322733
stackaddr: *mut *mut ::c_void,

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

+1
Original file line numberDiff line numberDiff line change
@@ -1827,6 +1827,7 @@ extern "C" {
18271827
attr: *const ::pthread_attr_t,
18281828
guardsize: *mut ::size_t,
18291829
) -> ::c_int;
1830+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
18301831
pub fn pthread_attr_getstack(
18311832
attr: *const ::pthread_attr_t,
18321833
stackaddr: *mut *mut ::c_void,

src/unix/haiku/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -1679,6 +1679,7 @@ extern "C" {
16791679
attr: *const ::pthread_attr_t,
16801680
guardsize: *mut ::size_t,
16811681
) -> ::c_int;
1682+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
16821683
pub fn pthread_attr_getstack(
16831684
attr: *const ::pthread_attr_t,
16841685
stackaddr: *mut *mut ::c_void,

src/unix/linux_like/android/mod.rs

-4
Original file line numberDiff line numberDiff line change
@@ -3498,10 +3498,6 @@ extern "C" {
34983498
guardsize: *mut ::size_t,
34993499
) -> ::c_int;
35003500
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
3501-
pub fn pthread_attr_getstacksize(
3502-
attr: *const ::pthread_attr_t,
3503-
stacksize: *mut ::size_t,
3504-
) -> ::c_int;
35053501
pub fn pthread_attr_getinheritsched(
35063502
attr: *const ::pthread_attr_t,
35073503
flag: *mut ::c_int,

src/unix/linux_like/linux/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -4582,6 +4582,7 @@ extern "C" {
45824582
attr: *const ::pthread_attr_t,
45834583
guardsize: *mut ::size_t,
45844584
) -> ::c_int;
4585+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
45854586
pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int;
45864587
pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
45874588
pub fn pthread_condattr_getpshared(

src/unix/mod.rs

+4
Original file line numberDiff line numberDiff line change
@@ -1076,6 +1076,10 @@ extern "C" {
10761076
pub fn pthread_exit(value: *mut ::c_void) -> !;
10771077
pub fn pthread_attr_init(attr: *mut ::pthread_attr_t) -> ::c_int;
10781078
pub fn pthread_attr_destroy(attr: *mut ::pthread_attr_t) -> ::c_int;
1079+
pub fn pthread_attr_getstacksize(
1080+
attr: *const ::pthread_attr_t,
1081+
stacksize: *mut ::size_t,
1082+
) -> ::c_int;
10791083
pub fn pthread_attr_setstacksize(attr: *mut ::pthread_attr_t, stack_size: ::size_t) -> ::c_int;
10801084
pub fn pthread_attr_setdetachstate(attr: *mut ::pthread_attr_t, state: ::c_int) -> ::c_int;
10811085
pub fn pthread_detach(thread: ::pthread_t) -> ::c_int;

src/unix/nto/mod.rs

+1
Original file line numberDiff line numberDiff line change
@@ -3092,6 +3092,7 @@ extern "C" {
30923092
attr: *const ::pthread_attr_t,
30933093
guardsize: *mut ::size_t,
30943094
) -> ::c_int;
3095+
pub fn pthread_attr_setguardsize(attr: *mut ::pthread_attr_t, guardsize: ::size_t) -> ::c_int;
30953096
pub fn sethostname(name: *const ::c_char, len: ::size_t) -> ::c_int;
30963097
pub fn sched_get_priority_min(policy: ::c_int) -> ::c_int;
30973098
pub fn pthread_condattr_getpshared(

0 commit comments

Comments
 (0)