diff options
| author | Joseph Myers <joseph@codesourcery.com> | 2013-02-19 00:49:25 +0000 |
|---|---|---|
| committer | Joseph Myers <joseph@codesourcery.com> | 2013-02-19 00:49:25 +0000 |
| commit | 92363eb87caf17ea20d262a0eceaf8cace53d374 (patch) | |
| tree | 74591fe6f9edfdf271b5bdd394f8552e76f30c80 | |
| parent | 6c89344ec29ad96cfdee5330ed012d1187ff1675 (diff) | |
| download | glibc-92363eb87caf17ea20d262a0eceaf8cace53d374.tar.gz | |
Add FUTEX_*_REQUEUE_PI support for MIPS.
| -rw-r--r-- | ports/ChangeLog.mips | 10 | ||||
| -rw-r--r-- | ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h | 30 |
2 files changed, 40 insertions, 0 deletions
diff --git a/ports/ChangeLog.mips b/ports/ChangeLog.mips index de967c65d1..c07bf97f8e 100644 --- a/ports/ChangeLog.mips +++ b/ports/ChangeLog.mips @@ -1,3 +1,13 @@ +2013-02-19 Joseph Myers <joseph@codesourcery.com> + + [BZ #14920] + * sysdeps/unix/sysv/linux/mips/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-02-18 Siddhesh Poyarekar <siddhesh@redhat.com> * sysdeps/unix/sysv/linux/mips/mips32/nptl/libc.abilist: Add diff --git a/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h b/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h index fe7c747cde..4f27b8b827 100644 --- a/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h +++ b/ports/sysdeps/unix/sysv/linux/mips/nptl/lowlevellock.h @@ -36,6 +36,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 @@ -141,6 +143,34 @@ INTERNAL_SYSCALL_ERROR_P (__ret, __err); \ }) +/* 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); \ + }) + static inline int __attribute__((always_inline)) __lll_trylock(int *futex) { |