Message ID | f579f1aae7ab4243db5021f3a8b61056806e746f.1560875584.git-series.mac@mcrowe.com |
---|---|
State | New |
Headers | show |
Series | nptl: Implement POSIX-proposed _clock variants of existing _timed functions | expand |
On 18/06/2019 13:33, Mike Crowe wrote: > nptl: Add POSIX-proposed pthread_mutex_clocklock function that works like > pthread_mutex_timedlock but takes a clockid parameter to measure the > abstime parameter against. LGTM with smalls nits regarding comments. > > * sysdeps/nptl/pthread.h: Add pthread_mutex_clocklock. > > * nptl/DESIGN-systemtap-probes.txt: Likewise. > > * nptl/pthread_mutex_timedlock.c (__pthread_mutex_clocklock_common): Rename > from __pthread_mutex_timedlock and add clockid parameter. Pass this > parameter to lll_clocklock and lll_clocklock_elision in place of > CLOCK_REALTIME. (__pthread_mutex_clocklock): New function to add > LIBC_PROBE and validate clockid parameter before calling > __pthread_mutex_clocklock_common. (__pthread_mutex_timedlock): New > implementation to add LIBC_PROBE and calls > __pthread_mutex_clocklock_common passing CLOCK_REALTIME as the clockid. > > * nptl/Makefile: Add tst-mutex11.c. > > * nptl/tst-abstime.c (th): Add tests for pthread_mutex_clocklock. > > * nptl/tst-mutex11.c: New tests for passing invalid and unsupported clockid > parameters to pthread_mutex_clocklock. > > * nptl/tst-mutex5.c (do_test_clock): Rename from do_test and take clockid > parameter to indicate which clock to be used. Call > pthread_mutex_timedlock or pthread_mutex_clocklock as appropriate. > (do_test): Call do_test_clock to separately test pthread_mutex_timedlock, > pthread_mutex_clocklock(CLOCK_REALTIME) and > pthread_mutex_clocklock(CLOCK_MONOTONIC). > > * nptl/tst-mutex9.c: Likewise. > > * nptl/Versions (GLIBC_2.30): Add pthread_mutex_clocklock. > > * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > (GLIBC_2.30): Likewise. > > * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > (GLIBC_2.30): Likewise. > > * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > (GLIBC_2.30): Likewise. > > * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist (GLIBC_2.30): > Likewise. > > * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist (GLIBC_2.30): > Likewise. > --- > ChangeLog | 81 +++++++- > nptl/DESIGN-systemtap-probes.txt | 3 +- > nptl/Makefile | 2 +- > nptl/Versions | 1 +- > nptl/pthread_mutex_timedlock.c | 40 ++- > nptl/tst-abstime.c | 2 +- > nptl/tst-mutex11.c | 69 ++++++- > nptl/tst-mutex5.c | 36 ++- > nptl/tst-mutex9.c | 24 +- > sysdeps/nptl/pthread.h | 7 +- > sysdeps/unix/sysv/linux/aarch64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/alpha/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/arm/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/csky/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/hppa/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/i386/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/ia64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/microblaze/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/nios2/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/sh/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist | 1 +- > sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist | 1 +- > 34 files changed, 267 insertions(+), 22 deletions(-) > create mode 100644 nptl/tst-mutex11.c > > diff --git a/ChangeLog b/ChangeLog > index 713c677..a213eb1 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,5 +1,86 @@ > 2019-05-31 Mike Crowe <mac@mcrowe.com> > > + nptl: Add POSIX-proposed pthread_mutex_clocklock function that > + works like pthread_mutex_timedlock but takes a clockid parameter to > + measure the abstime parameter against. > + > + * sysdeps/nptl/pthread.h: Add pthread_mutex_clocklock. > + * nptl/DESIGN-systemtap-probes.txt: Likewise. > + * nptl/pthread_mutex_timedlock.c > + (__pthread_mutex_clocklock_common): Rename from > + __pthread_mutex_timedlock and add clockid parameter. Pass this > + parameter to lll_clocklock and lll_clocklock_elision in place of > + CLOCK_REALTIME. (__pthread_mutex_clocklock): New function to add > + LIBC_PROBE and validate clockid parameter before calling > + __pthread_mutex_clocklock_common. (__pthread_mutex_timedlock): New > + implementation to add LIBC_PROBE and calls > + __pthread_mutex_clocklock_common passing CLOCK_REALTIME as the > + clockid. > + > + * nptl/Makefile: Add tst-mutex11.c. > + * nptl/tst-abstime.c (th): Add tests for pthread_mutex_clocklock. > + * nptl/tst-mutex11.c: New tests for passing invalid and unsupported > + clockid parameters to pthread_mutex_clocklock. > + * nptl/tst-mutex5.c (do_test_clock): Rename from do_test and take > + clockid parameter to indicate which clock to be used. Call > + pthread_mutex_timedlock or pthread_mutex_clocklock as appropriate. > + (do_test): Call do_test_clock to separately test > + pthread_mutex_timedlock, pthread_mutex_clocklock(CLOCK_REALTIME) > + and pthread_mutex_clocklock(CLOCK_MONOTONIC). > + * nptl/tst-mutex9.c: Likewise. > + > + * nptl/Versions (GLIBC_2.30): Add pthread_mutex_clocklock. > + * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.30): > + Likewise. > + * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > + (GLIBC_2.30): Likewise. > + * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > + (GLIBC_2.30): Likewise. > + > +2019-05-31 Mike Crowe <mac@mcrowe.com> > + > nptl: 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 Ok. > diff --git a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt > index ac972a9..6a62e25 100644 > --- a/nptl/DESIGN-systemtap-probes.txt > +++ b/nptl/DESIGN-systemtap-probes.txt > @@ -32,6 +32,9 @@ mutex_entry - probe for entry to the pthread_mutex_lock function > arg1 = address of mutex lock > mutex_timedlock_entry - probe for entry to the pthread_mutex_timedlock function > arg1 = address of mutex lock, arg2 = address of timespec > +mutex_clocklock_entry - probe for entry to the pthread_mutex_clocklock function > + arg1 = address of mutex lock, arg2 = clockid, > + arg3 = address of timespec > mutex_release - probe for pthread_mutex_unlock after the successful release of a > mutex lock > arg1 = address of mutex lock Ok. > diff --git a/nptl/Makefile b/nptl/Makefile > index d86513a..a2d25fb 100644 > --- a/nptl/Makefile > +++ b/nptl/Makefile > @@ -243,7 +243,7 @@ LDLIBS-tst-minstack-throw = -lstdc++ > > tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ > tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \ > - tst-mutex7 tst-mutex9 tst-mutex10 tst-mutex5a tst-mutex7a \ > + tst-mutex7 tst-mutex9 tst-mutex10 tst-mutex11 tst-mutex5a tst-mutex7a \ > tst-mutex7robust tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \ > tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \ > tst-mutexpi9 \ Ok. > diff --git a/nptl/Versions b/nptl/Versions > index ce79959..e903b84 100644 > --- a/nptl/Versions > +++ b/nptl/Versions > @@ -280,6 +280,7 @@ libpthread { > GLIBC_2.30 { > sem_clockwait; pthread_cond_clockwait; > pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; > + pthread_mutex_clocklock; > } > > GLIBC_PRIVATE { Ok. > diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c > index 10a9989..52c258e 100644 > --- a/nptl/pthread_mutex_timedlock.c > +++ b/nptl/pthread_mutex_timedlock.c > @@ -42,15 +42,14 @@ > #endif > > int > -__pthread_mutex_timedlock (pthread_mutex_t *mutex, > - const struct timespec *abstime) > +__pthread_mutex_clocklock_common (pthread_mutex_t *mutex, > + clockid_t clockid, > + const struct timespec *abstime) > { > int oldval; > pid_t id = THREAD_GETMEM (THREAD_SELF, tid); > int result = 0; > > - LIBC_PROBE (mutex_timedlock_entry, 2, mutex, abstime); > - > /* We must not check ABSTIME here. If the thread does not block > abstime must not be checked for a valid value. */ > > @@ -76,7 +75,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > } > > /* We have to get the mutex. */ > - result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime, > + result = lll_clocklock (mutex->__data.__lock, clockid, abstime, > PTHREAD_MUTEX_PSHARED (mutex)); > > if (result != 0) Ok. > @@ -99,7 +98,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > FORCE_ELISION (mutex, goto elision); > simple: > /* Normal mutex. */ > - result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime, > + result = lll_clocklock (mutex->__data.__lock, clockid, abstime, > PTHREAD_MUTEX_PSHARED (mutex)); > break; > > @@ -108,7 +107,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > /* Don't record ownership */ > return lll_clocklock_elision (mutex->__data.__lock, > mutex->__data.__spins, > - CLOCK_REALTIME, abstime, > + clockid, abstime, > PTHREAD_MUTEX_PSHARED (mutex)); > > > @@ -126,7 +125,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > if (cnt++ >= max_cnt) > { > result = lll_clocklock (mutex->__data.__lock, > - CLOCK_REALTIME, abstime, > + clockid, abstime, > PTHREAD_MUTEX_PSHARED (mutex)); > break; > } > @@ -269,7 +268,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > > /* Block using the futex. */ > int err = lll_futex_clock_wait_bitset (&mutex->__data.__lock, > - oldval, CLOCK_REALTIME, abstime, > + oldval, clockid, abstime, > PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); > /* The futex call timed out. */ > if (err == -ETIMEDOUT) > @@ -405,7 +404,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > struct timespec reltime; > struct timespec now; > > - INTERNAL_SYSCALL (clock_gettime, __err, 2, CLOCK_REALTIME, > + INTERNAL_SYSCALL (clock_gettime, __err, 2, clockid, > &now); > reltime.tv_sec = abstime->tv_sec - now.tv_sec; > reltime.tv_nsec = abstime->tv_nsec - now.tv_nsec; Ok. > @@ -623,4 +622,25 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, > out: > return result; > } > + > +int > +__pthread_mutex_clocklock (pthread_mutex_t *mutex, > + clockid_t clockid, > + const struct timespec *abstime) > +{ > + if (__glibc_unlikely (!lll_futex_supported_clockid (clockid))) > + return EINVAL; > + > + LIBC_PROBE (mutex_clocklock_entry, 3, mutex, clockid, abstime); > + return __pthread_mutex_clocklock_common (mutex, clockid, abstime); > +} > +weak_alias (__pthread_mutex_clocklock, pthread_mutex_clocklock) > + > +int > +__pthread_mutex_timedlock (pthread_mutex_t *mutex, > + const struct timespec *abstime) > +{ > + LIBC_PROBE (mutex_timedlock_entry, 2, mutex, abstime); > + return __pthread_mutex_clocklock_common (mutex, CLOCK_REALTIME, abstime); > +} > weak_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock) Ok. > diff --git a/nptl/tst-abstime.c b/nptl/tst-abstime.c > index c5040c5..30dea4d 100644 > --- a/nptl/tst-abstime.c > +++ b/nptl/tst-abstime.c > @@ -36,6 +36,8 @@ th (void *arg) > struct timespec t = { -2, 0 }; > > TEST_COMPARE (pthread_mutex_timedlock (&m1, &t), ETIMEDOUT); > + TEST_COMPARE (pthread_mutex_clocklock (&m1, CLOCK_REALTIME, &t), ETIMEDOUT); > + TEST_COMPARE (pthread_mutex_clocklock (&m1, CLOCK_MONOTONIC, &t), ETIMEDOUT); > TEST_COMPARE (pthread_rwlock_timedrdlock (&rw1, &t), ETIMEDOUT); > TEST_COMPARE (pthread_rwlock_timedwrlock (&rw2, &t), ETIMEDOUT); > TEST_COMPARE (pthread_rwlock_clockrdlock (&rw1, CLOCK_REALTIME, &t), Ok. > diff --git a/nptl/tst-mutex11.c b/nptl/tst-mutex11.c > new file mode 100644 > index 0000000..91f4281 > --- /dev/null > +++ b/nptl/tst-mutex11.c > @@ -0,0 +1,69 @@ > +/* Test unsupported/bad clocks passed to pthread_mutex_clocklock. > + > + Copyright (C) 2019 Free Software Foundation, Inc. > + This file is part of the GNU C Library. > + > + The GNU C Library is free software; you can redistribute it and/or > + modify it under the terms of the GNU Lesser General Public > + License as published by the Free Software Foundation; either > + version 2.1 of the License, or (at your option) any later version. > + > + The GNU C Library is distributed in the hope that it will be useful, > + but WITHOUT ANY WARRANTY; without even the implied warranty of > + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU > + Lesser General Public License for more details. > + > + You should have received a copy of the GNU Lesser General Public > + License along with the GNU C Library; if not, see > + <http://www.gnu.org/licenses/>. */ > + > +#include <errno.h> > +#include <pthread.h> > +#include <stdio.h> > +#include <time.h> > +#include <unistd.h> > +#include <support/check.h> > + > +static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER; > + > +static void test_bad_clockid (clockid_t clockid) > +{ > + const struct timespec ts = {0,0}; > + TEST_COMPARE (pthread_mutex_clocklock (&mut, clockid, &ts), EINVAL); > +} > + > +#define NOT_A_VALID_CLOCK 123456 > + > +static int > +do_test (void) > +{ > + /* These clocks are meaningless to pthread_mutex_clocklock. */ > +#if defined(CLOCK_PROCESS_CPUTIME_ID) > + test_bad_clockid (CLOCK_PROCESS_CPUTIME_ID); > +#endif > +#if defined(CLOCK_THREAD_CPUTIME_ID) > + test_bad_clockid (CLOCK_PROCESS_CPUTIME_ID); > +#endif > + > + /* These clocks might be meaningful, but are currently unsupported > + by pthread_mutex_clocklock. */ > +#if defined(CLOCK_REALTIME_COARSE) > + test_bad_clockid (CLOCK_REALTIME_COARSE); > +#endif > +#if defined(CLOCK_MONOTONIC_RAW) > + test_bad_clockid (CLOCK_MONOTONIC_RAW); > +#endif > +#if defined(CLOCK_MONOTONIC_COARSE) > + test_bad_clockid (CLOCK_MONOTONIC_COARSE); > +#endif > +#if defined(CLOCK_BOOTTIME) > + test_bad_clockid (CLOCK_BOOTTIME); > +#endif > + > + /* This is a completely invalid clock. */ > + test_bad_clockid (NOT_A_VALID_CLOCK); > + > + return 0; > +} > + > +#include <support/test-driver.c> Ok. > diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c > index fb27152..838ef7f 100644 > --- a/nptl/tst-mutex5.c > +++ b/nptl/tst-mutex5.c > @@ -32,12 +32,17 @@ > # define TYPE PTHREAD_MUTEX_NORMAL > #endif > > +/* A bogus clock value that tells run_test to use > + pthread_mutex_timedlock rather than pthread_mutex_clocklock. */ > +#define CLOCK_USE_TIMEDLOCK (-1) Two spaces after period (I will fix it for you). > > static int > -do_test (void) > +do_test_clock (clockid_t clockid, const char *fnname) > { > pthread_mutex_t m; > pthread_mutexattr_t a; > + const clockid_t clockid_for_get = > + (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid; > > TEST_COMPARE (pthread_mutexattr_init (&a), 0); > TEST_COMPARE (pthread_mutexattr_settype (&a, TYPE), 0); > @@ -62,16 +67,22 @@ do_test (void) > FAIL_EXIT1 ("mutex_trylock succeeded"); > > /* Wait 2 seconds. */ > - struct timespec ts_timeout = timespec_add (xclock_now (CLOCK_REALTIME), > + struct timespec ts_timeout = timespec_add (xclock_now (clockid_for_get), > make_timespec (2, 0)); > > - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), ETIMEDOUT); > - TEST_TIMESPEC_BEFORE_NOW (ts_timeout, CLOCK_REALTIME); > + if (clockid == CLOCK_USE_TIMEDLOCK) > + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), ETIMEDOUT); > + else > + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), ETIMEDOUT); Line too long. > + TEST_TIMESPEC_BEFORE_NOW (ts_timeout, clockid_for_get); > > /* The following makes the ts value invalid. */ > ts_timeout.tv_nsec += 1000000000; > > - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), EINVAL); > + if (clockid == CLOCK_USE_TIMEDLOCK) > + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), EINVAL); > + else > + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), EINVAL); > TEST_COMPARE (pthread_mutex_unlock (&m), 0); > > const struct timespec ts_start = xclock_now (CLOCK_REALTIME); > @@ -79,9 +90,12 @@ do_test (void) > /* Wait 2 seconds. */ > ts_timeout = timespec_add (ts_start, make_timespec (2, 0)); > > - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), 0); > + if (clockid == CLOCK_USE_TIMEDLOCK) > + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), 0); > + else > + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), 0); > > - const struct timespec ts_end = xclock_now (CLOCK_REALTIME); > + const struct timespec ts_end = xclock_now (clockid_for_get); > > /* Check that timedlock didn't delay. We use a limit of 0.1 secs. */ > TEST_TIMESPEC_BEFORE (ts_end, > @@ -93,4 +107,12 @@ do_test (void) > return 0; > } > > +static int do_test (void) > +{ > + do_test_clock (CLOCK_USE_TIMEDLOCK, "timedlock"); > + do_test_clock (CLOCK_REALTIME, "clocklock(realtime)"); > + do_test_clock (CLOCK_MONOTONIC, "clocklock(monotonic)"); > + return 0; > +} > + > #include <support/test-driver.c> Ok. > diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c > index e9fd8e2..c058d20 100644 > --- a/nptl/tst-mutex9.c > +++ b/nptl/tst-mutex9.c > @@ -31,9 +31,15 @@ > #include <support/xunistd.h> > > > -static int > -do_test (void) > +/* A bogus clock value that tells run_test to use > + pthread_mutex_timedlock rather than pthread_mutex_clocklock. */ Two spaces after period (I will fix it for you). > +#define CLOCK_USE_TIMEDLOCK (-1) > + > +static void > +do_test_clock (clockid_t clockid) > { > + const clockid_t clockid_for_get = > + (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid; > size_t ps = sysconf (_SC_PAGESIZE); > char tmpfname[] = "/tmp/tst-mutex9.XXXXXX"; > char data[ps]; > @@ -95,10 +101,13 @@ do_test (void) > if (pthread_mutex_unlock (m) == 0) > FAIL_EXIT1 ("child: mutex_unlock succeeded"); > > - const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), > + const struct timespec ts = timespec_add (xclock_now (clockid_for_get), > make_timespec (0, 500000000)); > > - TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT); > + if (clockid == CLOCK_USE_TIMEDLOCK) > + TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT); > + else > + TEST_COMPARE (pthread_mutex_clocklock (m, clockid, &ts), ETIMEDOUT); > > alarm (1); > > @@ -117,7 +126,14 @@ do_test (void) > if (! WIFSIGNALED (status)) > FAIL_EXIT1 ("child not killed by signal"); > TEST_COMPARE (WTERMSIG (status), SIGALRM); > +} > > +static int > +do_test (void) > +{ > + do_test_clock (CLOCK_USE_TIMEDLOCK); > + do_test_clock (CLOCK_REALTIME); > + do_test_clock (CLOCK_MONOTONIC); > return 0; > } > Ok. > diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h > index e78003e..a767d6f 100644 > --- a/sysdeps/nptl/pthread.h > +++ b/sysdeps/nptl/pthread.h > @@ -770,6 +770,13 @@ extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex, > __abstime) __THROWNL __nonnull ((1, 2)); > #endif > > +#ifdef __USE_GNU > +extern int pthread_mutex_clocklock (pthread_mutex_t *__restrict __mutex, > + clockid_t __clockid, > + const struct timespec *__restrict > + __abstime) __THROWNL __nonnull ((1, 3)); > +#endif > + > /* Unlock a mutex. */ > extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) > __THROWNL __nonnull ((1)); Ok. > diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > index 9f65baf..69f48bf 100644 > --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist > @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > index 0709855..d1d53cf 100644 > --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist > @@ -228,6 +228,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/arm/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/libpthread.abilist > index a2be572..3d2287b 100644 > --- a/sysdeps/unix/sysv/linux/arm/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/arm/libpthread.abilist > @@ -28,6 +28,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist > index c3a1834..52373fc 100644 > --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist > @@ -234,6 +234,7 @@ GLIBC_2.29 wait F > GLIBC_2.29 waitpid F > GLIBC_2.29 write F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > index 2a00ebc..d11e150 100644 > --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist > @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist > index 4479947..1b385ca 100644 > --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist > @@ -254,6 +254,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > index 40a1faf..bde9948 100644 > --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist > @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > index a2be572..3d2287b 100644 > --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist > @@ -28,6 +28,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > index 4479947..1b385ca 100644 > --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist > @@ -254,6 +254,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist > index 254b708..f0365f3 100644 > --- a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist > @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > index 29ffdd1..b1dff8e 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist > @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > index 29ffdd1..b1dff8e 100644 > --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist > @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > index 3fae328..0150ea3 100644 > --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist > @@ -242,6 +242,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > index a90010d..9e71e17 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist > @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.3.4 siglongjmp F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > index 339eab8..393ec87 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist > @@ -247,6 +247,7 @@ GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.3.4 siglongjmp F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > index 9f65baf..69f48bf 100644 > --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist > @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > index 83082fb..7dab4e5 100644 > --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist > @@ -236,6 +236,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > index 54e937b..7db2a0c 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist > @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > index 87f978b..7c10bb2 100644 > --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist > @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/sh/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/libpthread.abilist > index 2a00ebc..d11e150 100644 > --- a/sysdeps/unix/sysv/linux/sh/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sh/libpthread.abilist > @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > index bc29a66..7aa6416 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist > @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > index 40a1faf..bde9948 100644 > --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist > @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > index 70f04cc..c5ecb12 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist > @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F > GLIBC_2.3.4 pthread_setaffinity_np F > GLIBC_2.3.4 pthread_setschedprio F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > index 92cd2f4..a7ff3fb 100644 > --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist > @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F > GLIBC_2.28 tss_get F > GLIBC_2.28 tss_set F > GLIBC_2.30 pthread_cond_clockwait F > +GLIBC_2.30 pthread_mutex_clocklock F > GLIBC_2.30 pthread_rwlock_clockrdlock F > GLIBC_2.30 pthread_rwlock_clockwrlock F > GLIBC_2.30 sem_clockwait F > Ok.
diff --git a/ChangeLog b/ChangeLog index 713c677..a213eb1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,86 @@ 2019-05-31 Mike Crowe <mac@mcrowe.com> + nptl: Add POSIX-proposed pthread_mutex_clocklock function that + works like pthread_mutex_timedlock but takes a clockid parameter to + measure the abstime parameter against. + + * sysdeps/nptl/pthread.h: Add pthread_mutex_clocklock. + * nptl/DESIGN-systemtap-probes.txt: Likewise. + * nptl/pthread_mutex_timedlock.c + (__pthread_mutex_clocklock_common): Rename from + __pthread_mutex_timedlock and add clockid parameter. Pass this + parameter to lll_clocklock and lll_clocklock_elision in place of + CLOCK_REALTIME. (__pthread_mutex_clocklock): New function to add + LIBC_PROBE and validate clockid parameter before calling + __pthread_mutex_clocklock_common. (__pthread_mutex_timedlock): New + implementation to add LIBC_PROBE and calls + __pthread_mutex_clocklock_common passing CLOCK_REALTIME as the + clockid. + + * nptl/Makefile: Add tst-mutex11.c. + * nptl/tst-abstime.c (th): Add tests for pthread_mutex_clocklock. + * nptl/tst-mutex11.c: New tests for passing invalid and unsupported + clockid parameters to pthread_mutex_clocklock. + * nptl/tst-mutex5.c (do_test_clock): Rename from do_test and take + clockid parameter to indicate which clock to be used. Call + pthread_mutex_timedlock or pthread_mutex_clocklock as appropriate. + (do_test): Call do_test_clock to separately test + pthread_mutex_timedlock, pthread_mutex_clocklock(CLOCK_REALTIME) + and pthread_mutex_clocklock(CLOCK_MONOTONIC). + * nptl/tst-mutex9.c: Likewise. + + * nptl/Versions (GLIBC_2.30): Add pthread_mutex_clocklock. + * sysdeps/unix/sysv/linux/aarch64/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/alpha/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/arm/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/csky/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/hppa/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/i386/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/ia64/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/microblaze/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/nios2/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/sh/libpthread.abilist (GLIBC_2.30): + Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist + (GLIBC_2.30): Likewise. + * sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist + (GLIBC_2.30): Likewise. + +2019-05-31 Mike Crowe <mac@mcrowe.com> + nptl: 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 diff --git a/nptl/DESIGN-systemtap-probes.txt b/nptl/DESIGN-systemtap-probes.txt index ac972a9..6a62e25 100644 --- a/nptl/DESIGN-systemtap-probes.txt +++ b/nptl/DESIGN-systemtap-probes.txt @@ -32,6 +32,9 @@ mutex_entry - probe for entry to the pthread_mutex_lock function arg1 = address of mutex lock mutex_timedlock_entry - probe for entry to the pthread_mutex_timedlock function arg1 = address of mutex lock, arg2 = address of timespec +mutex_clocklock_entry - probe for entry to the pthread_mutex_clocklock function + arg1 = address of mutex lock, arg2 = clockid, + arg3 = address of timespec mutex_release - probe for pthread_mutex_unlock after the successful release of a mutex lock arg1 = address of mutex lock diff --git a/nptl/Makefile b/nptl/Makefile index d86513a..a2d25fb 100644 --- a/nptl/Makefile +++ b/nptl/Makefile @@ -243,7 +243,7 @@ LDLIBS-tst-minstack-throw = -lstdc++ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \ tst-mutex1 tst-mutex2 tst-mutex3 tst-mutex4 tst-mutex5 tst-mutex6 \ - tst-mutex7 tst-mutex9 tst-mutex10 tst-mutex5a tst-mutex7a \ + tst-mutex7 tst-mutex9 tst-mutex10 tst-mutex11 tst-mutex5a tst-mutex7a \ tst-mutex7robust tst-mutexpi1 tst-mutexpi2 tst-mutexpi3 tst-mutexpi4 \ tst-mutexpi5 tst-mutexpi5a tst-mutexpi6 tst-mutexpi7 tst-mutexpi7a \ tst-mutexpi9 \ diff --git a/nptl/Versions b/nptl/Versions index ce79959..e903b84 100644 --- a/nptl/Versions +++ b/nptl/Versions @@ -280,6 +280,7 @@ libpthread { GLIBC_2.30 { sem_clockwait; pthread_cond_clockwait; pthread_rwlock_clockrdlock; pthread_rwlock_clockwrlock; + pthread_mutex_clocklock; } GLIBC_PRIVATE { diff --git a/nptl/pthread_mutex_timedlock.c b/nptl/pthread_mutex_timedlock.c index 10a9989..52c258e 100644 --- a/nptl/pthread_mutex_timedlock.c +++ b/nptl/pthread_mutex_timedlock.c @@ -42,15 +42,14 @@ #endif int -__pthread_mutex_timedlock (pthread_mutex_t *mutex, - const struct timespec *abstime) +__pthread_mutex_clocklock_common (pthread_mutex_t *mutex, + clockid_t clockid, + const struct timespec *abstime) { int oldval; pid_t id = THREAD_GETMEM (THREAD_SELF, tid); int result = 0; - LIBC_PROBE (mutex_timedlock_entry, 2, mutex, abstime); - /* We must not check ABSTIME here. If the thread does not block abstime must not be checked for a valid value. */ @@ -76,7 +75,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, } /* We have to get the mutex. */ - result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime, + result = lll_clocklock (mutex->__data.__lock, clockid, abstime, PTHREAD_MUTEX_PSHARED (mutex)); if (result != 0) @@ -99,7 +98,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, FORCE_ELISION (mutex, goto elision); simple: /* Normal mutex. */ - result = lll_clocklock (mutex->__data.__lock, CLOCK_REALTIME, abstime, + result = lll_clocklock (mutex->__data.__lock, clockid, abstime, PTHREAD_MUTEX_PSHARED (mutex)); break; @@ -108,7 +107,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, /* Don't record ownership */ return lll_clocklock_elision (mutex->__data.__lock, mutex->__data.__spins, - CLOCK_REALTIME, abstime, + clockid, abstime, PTHREAD_MUTEX_PSHARED (mutex)); @@ -126,7 +125,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, if (cnt++ >= max_cnt) { result = lll_clocklock (mutex->__data.__lock, - CLOCK_REALTIME, abstime, + clockid, abstime, PTHREAD_MUTEX_PSHARED (mutex)); break; } @@ -269,7 +268,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, /* Block using the futex. */ int err = lll_futex_clock_wait_bitset (&mutex->__data.__lock, - oldval, CLOCK_REALTIME, abstime, + oldval, clockid, abstime, PTHREAD_ROBUST_MUTEX_PSHARED (mutex)); /* The futex call timed out. */ if (err == -ETIMEDOUT) @@ -405,7 +404,7 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, struct timespec reltime; struct timespec now; - INTERNAL_SYSCALL (clock_gettime, __err, 2, CLOCK_REALTIME, + INTERNAL_SYSCALL (clock_gettime, __err, 2, clockid, &now); reltime.tv_sec = abstime->tv_sec - now.tv_sec; reltime.tv_nsec = abstime->tv_nsec - now.tv_nsec; @@ -623,4 +622,25 @@ __pthread_mutex_timedlock (pthread_mutex_t *mutex, out: return result; } + +int +__pthread_mutex_clocklock (pthread_mutex_t *mutex, + clockid_t clockid, + const struct timespec *abstime) +{ + if (__glibc_unlikely (!lll_futex_supported_clockid (clockid))) + return EINVAL; + + LIBC_PROBE (mutex_clocklock_entry, 3, mutex, clockid, abstime); + return __pthread_mutex_clocklock_common (mutex, clockid, abstime); +} +weak_alias (__pthread_mutex_clocklock, pthread_mutex_clocklock) + +int +__pthread_mutex_timedlock (pthread_mutex_t *mutex, + const struct timespec *abstime) +{ + LIBC_PROBE (mutex_timedlock_entry, 2, mutex, abstime); + return __pthread_mutex_clocklock_common (mutex, CLOCK_REALTIME, abstime); +} weak_alias (__pthread_mutex_timedlock, pthread_mutex_timedlock) diff --git a/nptl/tst-abstime.c b/nptl/tst-abstime.c index c5040c5..30dea4d 100644 --- a/nptl/tst-abstime.c +++ b/nptl/tst-abstime.c @@ -36,6 +36,8 @@ th (void *arg) struct timespec t = { -2, 0 }; TEST_COMPARE (pthread_mutex_timedlock (&m1, &t), ETIMEDOUT); + TEST_COMPARE (pthread_mutex_clocklock (&m1, CLOCK_REALTIME, &t), ETIMEDOUT); + TEST_COMPARE (pthread_mutex_clocklock (&m1, CLOCK_MONOTONIC, &t), ETIMEDOUT); TEST_COMPARE (pthread_rwlock_timedrdlock (&rw1, &t), ETIMEDOUT); TEST_COMPARE (pthread_rwlock_timedwrlock (&rw2, &t), ETIMEDOUT); TEST_COMPARE (pthread_rwlock_clockrdlock (&rw1, CLOCK_REALTIME, &t), diff --git a/nptl/tst-mutex11.c b/nptl/tst-mutex11.c new file mode 100644 index 0000000..91f4281 --- /dev/null +++ b/nptl/tst-mutex11.c @@ -0,0 +1,69 @@ +/* Test unsupported/bad clocks passed to pthread_mutex_clocklock. + + Copyright (C) 2019 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, see + <http://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <pthread.h> +#include <stdio.h> +#include <time.h> +#include <unistd.h> +#include <support/check.h> + +static pthread_mutex_t mut = PTHREAD_MUTEX_INITIALIZER; + +static void test_bad_clockid (clockid_t clockid) +{ + const struct timespec ts = {0,0}; + TEST_COMPARE (pthread_mutex_clocklock (&mut, clockid, &ts), EINVAL); +} + +#define NOT_A_VALID_CLOCK 123456 + +static int +do_test (void) +{ + /* These clocks are meaningless to pthread_mutex_clocklock. */ +#if defined(CLOCK_PROCESS_CPUTIME_ID) + test_bad_clockid (CLOCK_PROCESS_CPUTIME_ID); +#endif +#if defined(CLOCK_THREAD_CPUTIME_ID) + test_bad_clockid (CLOCK_PROCESS_CPUTIME_ID); +#endif + + /* These clocks might be meaningful, but are currently unsupported + by pthread_mutex_clocklock. */ +#if defined(CLOCK_REALTIME_COARSE) + test_bad_clockid (CLOCK_REALTIME_COARSE); +#endif +#if defined(CLOCK_MONOTONIC_RAW) + test_bad_clockid (CLOCK_MONOTONIC_RAW); +#endif +#if defined(CLOCK_MONOTONIC_COARSE) + test_bad_clockid (CLOCK_MONOTONIC_COARSE); +#endif +#if defined(CLOCK_BOOTTIME) + test_bad_clockid (CLOCK_BOOTTIME); +#endif + + /* This is a completely invalid clock. */ + test_bad_clockid (NOT_A_VALID_CLOCK); + + return 0; +} + +#include <support/test-driver.c> diff --git a/nptl/tst-mutex5.c b/nptl/tst-mutex5.c index fb27152..838ef7f 100644 --- a/nptl/tst-mutex5.c +++ b/nptl/tst-mutex5.c @@ -32,12 +32,17 @@ # define TYPE PTHREAD_MUTEX_NORMAL #endif +/* A bogus clock value that tells run_test to use + pthread_mutex_timedlock rather than pthread_mutex_clocklock. */ +#define CLOCK_USE_TIMEDLOCK (-1) static int -do_test (void) +do_test_clock (clockid_t clockid, const char *fnname) { pthread_mutex_t m; pthread_mutexattr_t a; + const clockid_t clockid_for_get = + (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid; TEST_COMPARE (pthread_mutexattr_init (&a), 0); TEST_COMPARE (pthread_mutexattr_settype (&a, TYPE), 0); @@ -62,16 +67,22 @@ do_test (void) FAIL_EXIT1 ("mutex_trylock succeeded"); /* Wait 2 seconds. */ - struct timespec ts_timeout = timespec_add (xclock_now (CLOCK_REALTIME), + struct timespec ts_timeout = timespec_add (xclock_now (clockid_for_get), make_timespec (2, 0)); - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), ETIMEDOUT); - TEST_TIMESPEC_BEFORE_NOW (ts_timeout, CLOCK_REALTIME); + if (clockid == CLOCK_USE_TIMEDLOCK) + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), ETIMEDOUT); + else + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), ETIMEDOUT); + TEST_TIMESPEC_BEFORE_NOW (ts_timeout, clockid_for_get); /* The following makes the ts value invalid. */ ts_timeout.tv_nsec += 1000000000; - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), EINVAL); + if (clockid == CLOCK_USE_TIMEDLOCK) + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), EINVAL); + else + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), EINVAL); TEST_COMPARE (pthread_mutex_unlock (&m), 0); const struct timespec ts_start = xclock_now (CLOCK_REALTIME); @@ -79,9 +90,12 @@ do_test (void) /* Wait 2 seconds. */ ts_timeout = timespec_add (ts_start, make_timespec (2, 0)); - TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), 0); + if (clockid == CLOCK_USE_TIMEDLOCK) + TEST_COMPARE (pthread_mutex_timedlock (&m, &ts_timeout), 0); + else + TEST_COMPARE (pthread_mutex_clocklock (&m, clockid, &ts_timeout), 0); - const struct timespec ts_end = xclock_now (CLOCK_REALTIME); + const struct timespec ts_end = xclock_now (clockid_for_get); /* Check that timedlock didn't delay. We use a limit of 0.1 secs. */ TEST_TIMESPEC_BEFORE (ts_end, @@ -93,4 +107,12 @@ do_test (void) return 0; } +static int do_test (void) +{ + do_test_clock (CLOCK_USE_TIMEDLOCK, "timedlock"); + do_test_clock (CLOCK_REALTIME, "clocklock(realtime)"); + do_test_clock (CLOCK_MONOTONIC, "clocklock(monotonic)"); + return 0; +} + #include <support/test-driver.c> diff --git a/nptl/tst-mutex9.c b/nptl/tst-mutex9.c index e9fd8e2..c058d20 100644 --- a/nptl/tst-mutex9.c +++ b/nptl/tst-mutex9.c @@ -31,9 +31,15 @@ #include <support/xunistd.h> -static int -do_test (void) +/* A bogus clock value that tells run_test to use + pthread_mutex_timedlock rather than pthread_mutex_clocklock. */ +#define CLOCK_USE_TIMEDLOCK (-1) + +static void +do_test_clock (clockid_t clockid) { + const clockid_t clockid_for_get = + (clockid == CLOCK_USE_TIMEDLOCK) ? CLOCK_REALTIME : clockid; size_t ps = sysconf (_SC_PAGESIZE); char tmpfname[] = "/tmp/tst-mutex9.XXXXXX"; char data[ps]; @@ -95,10 +101,13 @@ do_test (void) if (pthread_mutex_unlock (m) == 0) FAIL_EXIT1 ("child: mutex_unlock succeeded"); - const struct timespec ts = timespec_add (xclock_now (CLOCK_REALTIME), + const struct timespec ts = timespec_add (xclock_now (clockid_for_get), make_timespec (0, 500000000)); - TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT); + if (clockid == CLOCK_USE_TIMEDLOCK) + TEST_COMPARE (pthread_mutex_timedlock (m, &ts), ETIMEDOUT); + else + TEST_COMPARE (pthread_mutex_clocklock (m, clockid, &ts), ETIMEDOUT); alarm (1); @@ -117,7 +126,14 @@ do_test (void) if (! WIFSIGNALED (status)) FAIL_EXIT1 ("child not killed by signal"); TEST_COMPARE (WTERMSIG (status), SIGALRM); +} +static int +do_test (void) +{ + do_test_clock (CLOCK_USE_TIMEDLOCK); + do_test_clock (CLOCK_REALTIME); + do_test_clock (CLOCK_MONOTONIC); return 0; } diff --git a/sysdeps/nptl/pthread.h b/sysdeps/nptl/pthread.h index e78003e..a767d6f 100644 --- a/sysdeps/nptl/pthread.h +++ b/sysdeps/nptl/pthread.h @@ -770,6 +770,13 @@ extern int pthread_mutex_timedlock (pthread_mutex_t *__restrict __mutex, __abstime) __THROWNL __nonnull ((1, 2)); #endif +#ifdef __USE_GNU +extern int pthread_mutex_clocklock (pthread_mutex_t *__restrict __mutex, + clockid_t __clockid, + const struct timespec *__restrict + __abstime) __THROWNL __nonnull ((1, 3)); +#endif + /* Unlock a mutex. */ extern int pthread_mutex_unlock (pthread_mutex_t *__mutex) __THROWNL __nonnull ((1)); diff --git a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist index 9f65baf..69f48bf 100644 --- a/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/aarch64/libpthread.abilist @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist index 0709855..d1d53cf 100644 --- a/sysdeps/unix/sysv/linux/alpha/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/alpha/libpthread.abilist @@ -228,6 +228,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/arm/libpthread.abilist b/sysdeps/unix/sysv/linux/arm/libpthread.abilist index a2be572..3d2287b 100644 --- a/sysdeps/unix/sysv/linux/arm/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/arm/libpthread.abilist @@ -28,6 +28,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/csky/libpthread.abilist b/sysdeps/unix/sysv/linux/csky/libpthread.abilist index c3a1834..52373fc 100644 --- a/sysdeps/unix/sysv/linux/csky/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/csky/libpthread.abilist @@ -234,6 +234,7 @@ GLIBC_2.29 wait F GLIBC_2.29 waitpid F GLIBC_2.29 write F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist index 2a00ebc..d11e150 100644 --- a/sysdeps/unix/sysv/linux/hppa/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/hppa/libpthread.abilist @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/i386/libpthread.abilist b/sysdeps/unix/sysv/linux/i386/libpthread.abilist index 4479947..1b385ca 100644 --- a/sysdeps/unix/sysv/linux/i386/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/i386/libpthread.abilist @@ -254,6 +254,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist index 40a1faf..bde9948 100644 --- a/sysdeps/unix/sysv/linux/ia64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/ia64/libpthread.abilist @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist index a2be572..3d2287b 100644 --- a/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/coldfire/libpthread.abilist @@ -28,6 +28,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist index 4479947..1b385ca 100644 --- a/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/m68k/m680x0/libpthread.abilist @@ -254,6 +254,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist index 254b708..f0365f3 100644 --- a/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/microblaze/libpthread.abilist @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist index 29ffdd1..b1dff8e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips32/libpthread.abilist @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist index 29ffdd1..b1dff8e 100644 --- a/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/mips/mips64/libpthread.abilist @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist index 3fae328..0150ea3 100644 --- a/sysdeps/unix/sysv/linux/nios2/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/nios2/libpthread.abilist @@ -242,6 +242,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist index a90010d..9e71e17 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/libpthread.abilist @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.3.4 siglongjmp F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist index 339eab8..393ec87 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/be/libpthread.abilist @@ -247,6 +247,7 @@ GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.3.4 siglongjmp F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist index 9f65baf..69f48bf 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/le/libpthread.abilist @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist index 83082fb..7dab4e5 100644 --- a/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/riscv/rv64/libpthread.abilist @@ -236,6 +236,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist index 54e937b..7db2a0c 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-32/libpthread.abilist @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist index 87f978b..7c10bb2 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/s390/s390-64/libpthread.abilist @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/sh/libpthread.abilist b/sysdeps/unix/sysv/linux/sh/libpthread.abilist index 2a00ebc..d11e150 100644 --- a/sysdeps/unix/sysv/linux/sh/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sh/libpthread.abilist @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist index bc29a66..7aa6416 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc32/libpthread.abilist @@ -256,6 +256,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist index 40a1faf..bde9948 100644 --- a/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/sparc/sparc64/libpthread.abilist @@ -248,6 +248,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist index 70f04cc..c5ecb12 100644 --- a/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/64/libpthread.abilist @@ -246,6 +246,7 @@ GLIBC_2.3.4 pthread_getaffinity_np F GLIBC_2.3.4 pthread_setaffinity_np F GLIBC_2.3.4 pthread_setschedprio F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist index 92cd2f4..a7ff3fb 100644 --- a/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist +++ b/sysdeps/unix/sysv/linux/x86_64/x32/libpthread.abilist @@ -244,6 +244,7 @@ GLIBC_2.28 tss_delete F GLIBC_2.28 tss_get F GLIBC_2.28 tss_set F GLIBC_2.30 pthread_cond_clockwait F +GLIBC_2.30 pthread_mutex_clocklock F GLIBC_2.30 pthread_rwlock_clockrdlock F GLIBC_2.30 pthread_rwlock_clockwrlock F GLIBC_2.30 sem_clockwait F