nptl: Add clockid parameter to futex timed wait calls
authorMike Crowe <mac@mcrowe.com>
Fri, 21 Jun 2019 14:53:40 +0000 (14:53 +0000)
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>
Fri, 12 Jul 2019 13:36:23 +0000 (13:36 +0000)
commit99d01ffcc386d1bfb681fb0684fcf6a6a996beb3
tree166e14d240825fdab7863e955dcbc9c8413c5781
parenta008c76b56e4f958cf5a0d6f67d29fade89421b7
nptl: Add clockid parameter to futex timed wait calls

In preparation for adding POSIX clockwait variants of timedwait functions,
add a clockid_t parameter to futex_abstimed_wait functions and pass
CLOCK_REALTIME from all callers for the time being.

Replace lll_futex_timed_wait_bitset with lll_futex_clock_wait_bitset
which takes a clockid_t parameter rather than the magic clockbit.

* sysdeps/nptl/lowlevellock-futex.h,
sysdeps/unix/sysv/linux/lowlevellock-futex.h: Replace
lll_futex_timed_wait_bitset with lll_futex_clock_wait_bitset that
takes a clockid rather than a special clockbit.
* sysdeps/nptl/lowlevellock-futex.h: Add
lll_futex_supported_clockid so that client functions can check
whether their clockid parameter is valid even if they don't
ultimately end up calling lll_futex_clock_wait_bitset.
* sysdeps/nptl/futex-internal.h,
sysdeps/unix/sysv/linux/futex-internal.h
(futex_abstimed_wait, futex_abstimed_wait_cancelable): Add
clockid_t parameter to indicate which clock the absolute time
passed should be measured against. Pass that clockid onto
lll_futex_clock_wait_bitset. Add invalid clock as reason for
returning -EINVAL.
* sysdeps/nptl/futex-internal.h,
sysdeps/unix/sysv/linux/futex-internal.h: Introduce
futex_abstimed_supported_clockid so that client functions can check
whether their clockid parameter is valid even if they don't
ultimately end up calling futex_abstimed_wait.
* nptl/pthread_cond_wait.c (__pthread_cond_wait_common): Remove
code to calculate relative timeout for
__PTHREAD_COND_CLOCK_MONOTONIC_MASK and just pass CLOCK_MONOTONIC
or CLOCK_REALTIME as required to futex_abstimed_wait_cancelable.
* nptl/pthread_rwlock_common (__pthread_rwlock_rdlock_full)
(__pthread_wrlock_full), nptl/sem_waitcommon (do_futex_wait): Pass
additional CLOCK_REALTIME to futex_abstimed_wait_cancelable.
* nptl/pthread_mutex_timedlock.c (__pthread_mutex_timedlock):
Switch to lll_futex_clock_wait_bitset and pass CLOCK_REALTIME

Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
ChangeLog
nptl/pthread_cond_wait.c
nptl/pthread_mutex_timedlock.c
nptl/pthread_rwlock_common.c
nptl/sem_waitcommon.c
sysdeps/nptl/futex-internal.h
sysdeps/nptl/lowlevellock-futex.h
sysdeps/unix/sysv/linux/futex-internal.h
sysdeps/unix/sysv/linux/lowlevellock-futex.h