Skip to content

Commit 6e3c675

Browse files
committed
Auto merge of #1336 - faern:add-futex-consts, r=gnzlbg
Add futex constants Adding some Futex constants. To be used in `parking_lot`. See https://github.com/faern/parking_lot/pull/1/files#r283110797
2 parents 8b14a7e + 72463fc commit 6e3c675

File tree

3 files changed

+40
-0
lines changed

3 files changed

+40
-0
lines changed

libc-test/build.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1245,6 +1245,7 @@ fn test_android(target: &str) {
12451245
"ifaddrs.h",
12461246
"limits.h",
12471247
"linux/dccp.h",
1248+
"linux/futex.h",
12481249
"linux/fs.h",
12491250
"linux/genetlink.h",
12501251
"linux/if_alg.h",
@@ -2353,6 +2354,7 @@ fn test_linux(target: &str) {
23532354
headers! {
23542355
cfg:
23552356
"linux/falloc.h",
2357+
"linux/futex.h",
23562358
"linux/fs.h",
23572359
"linux/genetlink.h",
23582360
"linux/if_alg.h",

src/unix/notbsd/android/mod.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1839,6 +1839,25 @@ pub const IN_ALL_EVENTS: ::uint32_t = (
18391839
pub const IN_CLOEXEC: ::c_int = O_CLOEXEC;
18401840
pub const IN_NONBLOCK: ::c_int = O_NONBLOCK;
18411841

1842+
pub const FUTEX_WAIT: ::c_int = 0;
1843+
pub const FUTEX_WAKE: ::c_int = 1;
1844+
pub const FUTEX_FD: ::c_int = 2;
1845+
pub const FUTEX_REQUEUE: ::c_int = 3;
1846+
pub const FUTEX_CMP_REQUEUE: ::c_int = 4;
1847+
pub const FUTEX_WAKE_OP: ::c_int = 5;
1848+
pub const FUTEX_LOCK_PI: ::c_int = 6;
1849+
pub const FUTEX_UNLOCK_PI: ::c_int = 7;
1850+
pub const FUTEX_TRYLOCK_PI: ::c_int = 8;
1851+
pub const FUTEX_WAIT_BITSET: ::c_int = 9;
1852+
pub const FUTEX_WAKE_BITSET: ::c_int = 10;
1853+
pub const FUTEX_WAIT_REQUEUE_PI: ::c_int = 11;
1854+
pub const FUTEX_CMP_REQUEUE_PI: ::c_int = 12;
1855+
1856+
pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
1857+
pub const FUTEX_CLOCK_REALTIME: ::c_int = 256;
1858+
pub const FUTEX_CMD_MASK: ::c_int =
1859+
!(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
1860+
18421861
f! {
18431862
pub fn CMSG_NXTHDR(mhdr: *const msghdr,
18441863
cmsg: *const cmsghdr) -> *mut cmsghdr {

src/unix/notbsd/linux/mod.rs

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1849,6 +1849,25 @@ pub const IN_ALL_EVENTS: ::uint32_t = (
18491849
pub const IN_CLOEXEC: ::c_int = O_CLOEXEC;
18501850
pub const IN_NONBLOCK: ::c_int = O_NONBLOCK;
18511851

1852+
pub const FUTEX_WAIT: ::c_int = 0;
1853+
pub const FUTEX_WAKE: ::c_int = 1;
1854+
pub const FUTEX_FD: ::c_int = 2;
1855+
pub const FUTEX_REQUEUE: ::c_int = 3;
1856+
pub const FUTEX_CMP_REQUEUE: ::c_int = 4;
1857+
pub const FUTEX_WAKE_OP: ::c_int = 5;
1858+
pub const FUTEX_LOCK_PI: ::c_int = 6;
1859+
pub const FUTEX_UNLOCK_PI: ::c_int = 7;
1860+
pub const FUTEX_TRYLOCK_PI: ::c_int = 8;
1861+
pub const FUTEX_WAIT_BITSET: ::c_int = 9;
1862+
pub const FUTEX_WAKE_BITSET: ::c_int = 10;
1863+
pub const FUTEX_WAIT_REQUEUE_PI: ::c_int = 11;
1864+
pub const FUTEX_CMP_REQUEUE_PI: ::c_int = 12;
1865+
1866+
pub const FUTEX_PRIVATE_FLAG: ::c_int = 128;
1867+
pub const FUTEX_CLOCK_REALTIME: ::c_int = 256;
1868+
pub const FUTEX_CMD_MASK: ::c_int =
1869+
!(FUTEX_PRIVATE_FLAG | FUTEX_CLOCK_REALTIME);
1870+
18521871
f! {
18531872
pub fn CMSG_NXTHDR(mhdr: *const msghdr,
18541873
cmsg: *const cmsghdr) -> *mut cmsghdr {

0 commit comments

Comments
 (0)