diff options
| author | Marcus Shawcroft <marcus.shawcroft@linaro.org> | 2013-12-17 13:29:04 +0000 |
|---|---|---|
| committer | Marcus Shawcroft <marcus.shawcroft@linaro.org> | 2013-12-17 17:57:34 +0000 |
| commit | 0f197fe5b65c6df1a3a0b6b36383d4babec85bd1 (patch) | |
| tree | a99b868a4ccf2a69121b7aed1dc5500f26b5d50d | |
| parent | affb6f78367df3e52230144e282d6664669a9cbf (diff) | |
[AArch64] Implement FUTEX_*_REQUEUE_PI
| -rw-r--r-- | ports/ChangeLog.aarch64 | 9 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h | 31 |
2 files changed, 40 insertions, 0 deletions
diff --git a/ports/ChangeLog.aarch64 b/ports/ChangeLog.aarch64 index 09645c39ce..b1f6729386 100644 --- a/ports/ChangeLog.aarch64 +++ b/ports/ChangeLog.aarch64 @@ -1,5 +1,14 @@ 2013-12-17 Marcus Shawcroft <marcus.shawcroft@linaro.org> + * sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h + (FUTEX_WAIT_REQUEUE_PI): Define. + (FUTEX_CMP_REQUEUE_PI): Likewise. + (lll_futex_wait_requeue_pi): Likewise. + (lll_futex_timed_wait_requeue_pi): Likewise. + (lll_futex_cmp_requeue_pi): Likewise. + +2013-12-17 Marcus Shawcroft <marcus.shawcroft@linaro.org> + * sysdeps/aarch64/libm-test-ulps: Regenerated. 2013-12-17 Marcus Shawcroft <marcus.shawcroft@linaro.org> diff --git a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h index 52f8a7a27d..851c85d753 100644 --- a/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/aarch64/nptl/lowlevellock.h @@ -37,6 +37,8 @@ #define FUTEX_TRYLOCK_PI 8 #define FUTEX_WAIT_BITSET 9 #define FUTEX_WAKE_BITSET 10 +#define FUTEX_WAIT_REQUEUE_PI 11 +#define FUTEX_CMP_REQUEUE_PI 12 #define FUTEX_PRIVATE_FLAG 128 #define FUTEX_CLOCK_REALTIME 256 @@ -143,6 +145,35 @@ }) +/* Priority Inheritance support. */ +#define lll_futex_wait_requeue_pi(futexp, val, mutex, private) \ + lll_futex_timed_wait_requeue_pi (futexp, val, NULL, 0, mutex, private) + +#define lll_futex_timed_wait_requeue_pi(futexp, val, timespec, clockbit, \ + mutex, private) \ + ({ \ + INTERNAL_SYSCALL_DECL (__err); \ + long int __ret; \ + int __op = FUTEX_WAIT_REQUEUE_PI | clockbit; \ + \ + __ret = INTERNAL_SYSCALL (futex, __err, 5, (futexp), \ + __lll_private_flag (__op, private), \ + (val), (timespec), mutex); \ + INTERNAL_SYSCALL_ERROR_P (__ret, __err) ? -__ret : __ret; \ + }) + +#define lll_futex_cmp_requeue_pi(futexp, nr_wake, nr_move, mutex, val, priv) \ + ({ \ + INTERNAL_SYSCALL_DECL (__err); \ + long int __ret; \ + \ + __ret = INTERNAL_SYSCALL (futex, __err, 6, (futexp), \ + __lll_private_flag (FUTEX_CMP_REQUEUE_PI, priv),\ + (nr_wake), (nr_move), (mutex), (val)); \ + INTERNAL_SYSCALL_ERROR_P (__ret, __err); \ + }) + + #define lll_trylock(lock) \ atomic_compare_and_exchange_val_acq(&(lock), 1, 0) |