diff options
| author | Mike Crowe <mac@mcrowe.com> | 2019-06-24 13:08:25 +0000 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2019-07-12 13:36:25 +0000 |
| commit | 59213094c84ec723efd2775a2ce8e4678e77f453 (patch) | |
| tree | 125e1fa70f04425f24178d5e9b93d7c8e79019f0 /sysdeps/nptl/lowlevellock.h | |
| parent | e996fa72a9bad0be72c6d3d99d9faba5efddf44f (diff) | |
| download | glibc-59213094c84ec723efd2775a2ce8e4678e77f453.tar.gz glibc-59213094c84ec723efd2775a2ce8e4678e77f453.tar.xz glibc-59213094c84ec723efd2775a2ce8e4678e77f453.zip | |
nptl: Rename lll_timedlock to lll_clocklock and add clockid parameter
Rename lll_timedlock to lll_clocklock and add clockid
parameter to indicate the clock that the abstime parameter should
be measured against in preparation for adding
pthread_mutex_clocklock.
The name change mirrors the naming for the exposed pthread functions:
timed => absolute timeout measured against CLOCK_REALTIME (or clock
specified by attribute in the case of pthread_cond_timedwait.)
clock => absolute timeout measured against clock specified in preceding
parameter.
* sysdeps/nptl/lowlevellock.h (lll_clocklock): Rename from
lll_timedlock and add clockid parameter. (__lll_clocklock): Rename
from __lll_timedlock and add clockid parameter.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_clocklock):
Likewise.
* nptl/lll_timedlock_wait.c (__lll_clocklock_wait): Rename from
__lll_timedlock_wait and add clockid parameter. Use __clock_gettime
rather than __gettimeofday so that clockid can be used. This means
that conversion from struct timeval is no longer required.
* sysdeps/sparc/sparc32/lowlevellock.c (lll_clocklock_wait):
Likewise.
* sysdeps/sparc/sparc32/lll_timedlock_wait.c: Update comment to
refer to __lll_clocklock_wait rather than __lll_timedlock_wait.
* nptl/pthread_mutex_timedlock.c (lll_clocklock_elision): Rename
from lll_timedlock_elision, add clockid parameter and use
meaningful names for other parameters. (__pthread_mutex_timedlock):
Pass CLOCK_REALTIME where necessary to lll_clocklock and
lll_clocklock_elision.
* sysdeps/unix/sysv/linux/powerpc/lowlevellock.h
(lll_clocklock_elision): Rename from lll_timedlock_elision and add
clockid parameter. (__lll_clocklock_elision): Rename from
__lll_timedlock_elision and add clockid parameter.
* sysdeps/unix/sysv/linux/s390/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/x86/lowlevellock.h: Likewise.
* sysdeps/unix/sysv/linux/powerpc/elision-timed.c
(__lll_lock_elision): Call __lll_clocklock_elision rather than
__lll_timedlock_elision. (EXTRAARG): Add clockid parameter.
(LLL_LOCK): Likewise.
* sysdeps/unix/sysv/linux/s390/elision-timed.c: Likewise.
* sysdeps/unix/sysv/linux/x86/elision-timed.c: Likewise.
Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Diffstat (limited to 'sysdeps/nptl/lowlevellock.h')
| -rw-r--r-- | sysdeps/nptl/lowlevellock.h | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/sysdeps/nptl/lowlevellock.h b/sysdeps/nptl/lowlevellock.h index e905829ee4..ac41b838ac 100644 --- a/sysdeps/nptl/lowlevellock.h +++ b/sysdeps/nptl/lowlevellock.h @@ -121,24 +121,26 @@ extern void __lll_lock_wait (int *futex, int private) attribute_hidden; #define lll_cond_lock(futex, private) __lll_cond_lock (&(futex), private) -extern int __lll_timedlock_wait (int *futex, const struct timespec *, +extern int __lll_clocklock_wait (int *futex, clockid_t, + const struct timespec *, int private) attribute_hidden; -/* As __lll_lock, but with a timeout. If the timeout occurs then return - ETIMEDOUT. If ABSTIME is invalid, return EINVAL. */ -#define __lll_timedlock(futex, abstime, private) \ +/* As __lll_lock, but with an absolute timeout measured against the clock + specified in CLOCKID. If the timeout occurs then return ETIMEDOUT. If + ABSTIME is invalid, return EINVAL. */ +#define __lll_clocklock(futex, clockid, abstime, private) \ ({ \ int *__futex = (futex); \ int __val = 0; \ \ if (__glibc_unlikely \ (atomic_compare_and_exchange_bool_acq (__futex, 1, 0))) \ - __val = __lll_timedlock_wait (__futex, abstime, private); \ + __val = __lll_clocklock_wait (__futex, clockid, abstime, private); \ __val; \ }) -#define lll_timedlock(futex, abstime, private) \ - __lll_timedlock (&(futex), abstime, private) +#define lll_clocklock(futex, clockid, abstime, private) \ + __lll_clocklock (&(futex), clockid, abstime, private) /* This is an expression rather than a statement even though its value is |