diff options
author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 03:12:36 +0200 |
---|---|---|
committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-06-07 03:14:49 +0200 |
commit | be22a151f3e2c2e4b9127d4fa30b269f30a7ea2e (patch) | |
tree | 8cac3fb673b78c9fe02a404e142350756ce9742b /sysdeps | |
parent | 6c5ca98d096a5f61144555c76fdfd3c2ad561082 (diff) | |
download | glibc-be22a151f3e2c2e4b9127d4fa30b269f30a7ea2e.zip glibc-be22a151f3e2c2e4b9127d4fa30b269f30a7ea2e.tar.gz glibc-be22a151f3e2c2e4b9127d4fa30b269f30a7ea2e.tar.bz2 |
htl: Add sem_clockwait support
* sysdeps/htl/sem-timedwait.c (__sem_timedwait_internal): Add clock_id
parameter instead of hardcoding CLOCK_REALTIME.
(__sem_clockwait): New function.
(sem_clockwait): New weak alias.
* sysdeps/htl/sem-wait.c (__sem_timedwait_internal): Update declaration.
(__sem_wait): Update call to __sem_timedwait_internal.
* htl/Versions (GLIBC_2.32): Add sem_clockwait.
* sysdeps/mach/hurd/i386/libpthread.abilist (sem_clockwait): Add symbol.
* nptl/Makefile (tests): Move tst-sem5 to...
* sysdeps/pthread/Makefile (tests): ... here.
Diffstat (limited to 'sysdeps')
-rw-r--r-- | sysdeps/htl/sem-timedwait.c | 12 | ||||
-rw-r--r-- | sysdeps/htl/sem-wait.c | 3 | ||||
-rw-r--r-- | sysdeps/mach/hurd/i386/libpthread.abilist | 1 | ||||
-rw-r--r-- | sysdeps/pthread/Makefile | 2 | ||||
-rw-r--r-- | sysdeps/pthread/tst-sem5.c | 63 |
5 files changed, 77 insertions, 4 deletions
diff --git a/sysdeps/htl/sem-timedwait.c b/sysdeps/htl/sem-timedwait.c index 2d8cf25..0b1b6d0 100644 --- a/sysdeps/htl/sem-timedwait.c +++ b/sysdeps/htl/sem-timedwait.c @@ -25,12 +25,12 @@ int __sem_timedwait_internal (sem_t *restrict sem, + clockid_t clock_id, const struct timespec *restrict timeout) { error_t err; int drain; struct __pthread *self; - clockid_t clock_id = CLOCK_REALTIME; __pthread_spin_wait (&sem->__lock); if (sem->__value > 0) @@ -89,9 +89,17 @@ __sem_timedwait_internal (sem_t *restrict sem, } int +__sem_clockwait (sem_t *sem, clockid_t clockid, + const struct timespec *restrict timeout) +{ + return __sem_timedwait_internal (sem, clockid, timeout); +} +weak_alias (__sem_clockwait, sem_clockwait); + +int __sem_timedwait (sem_t *restrict sem, const struct timespec *restrict timeout) { - return __sem_timedwait_internal (sem, timeout); + return __sem_timedwait_internal (sem, CLOCK_REALTIME, timeout); } weak_alias (__sem_timedwait, sem_timedwait); diff --git a/sysdeps/htl/sem-wait.c b/sysdeps/htl/sem-wait.c index 1db2d90..74b39d5 100644 --- a/sysdeps/htl/sem-wait.c +++ b/sysdeps/htl/sem-wait.c @@ -20,12 +20,13 @@ #include <pt-internal.h> extern int __sem_timedwait_internal (sem_t *restrict sem, + clockid_t clockid, const struct timespec *restrict timeout); int __sem_wait (sem_t *sem) { - return __sem_timedwait_internal (sem, 0); + return __sem_timedwait_internal (sem, CLOCK_REALTIME, 0); } strong_alias (__sem_wait, sem_wait); diff --git a/sysdeps/mach/hurd/i386/libpthread.abilist b/sysdeps/mach/hurd/i386/libpthread.abilist index a1026f0..a1e0a71 100644 --- a/sysdeps/mach/hurd/i386/libpthread.abilist +++ b/sysdeps/mach/hurd/i386/libpthread.abilist @@ -168,6 +168,7 @@ GLIBC_2.32 pthread_rwlock_clockrdlock F GLIBC_2.32 pthread_rwlock_clockwrlock F GLIBC_2.32 pthread_timedjoin_np F GLIBC_2.32 pthread_tryjoin_np F +GLIBC_2.32 sem_clockwait F GLIBC_2.32 thrd_create F GLIBC_2.32 thrd_detach F GLIBC_2.32 thrd_exit F diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 3dc8827..1d1ddeb 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -64,7 +64,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \ tst-rwlock13 tst-rwlock14 tst-rwlock16 \ tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \ - tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem6 tst-sem7 \ + tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \ tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \ tst-spin1 tst-spin2 tst-spin3 tst-spin4 \ tst-abstime diff --git a/sysdeps/pthread/tst-sem5.c b/sysdeps/pthread/tst-sem5.c new file mode 100644 index 0000000..766274e --- /dev/null +++ b/sysdeps/pthread/tst-sem5.c @@ -0,0 +1,63 @@ +/* Copyright (C) 2002-2020 Free Software Foundation, Inc. + This file is part of the GNU C Library. + Contributed by Ulrich Drepper <drepper@redhat.com>, 2002. + + 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 + <https://www.gnu.org/licenses/>. */ + +#include <errno.h> +#include <semaphore.h> +#include <time.h> +#include <unistd.h> +#include <sys/time.h> +#include <support/check.h> +#include <support/timespec.h> +#include <support/xtime.h> + +/* A bogus clock value that tells run_test to use sem_timedwait rather than + sem_clockwait. */ +#define CLOCK_USE_TIMEDWAIT (-1) + +static void +do_test_clock (clockid_t clockid) +{ + const clockid_t clockid_for_get = + clockid == CLOCK_USE_TIMEDWAIT ? CLOCK_REALTIME : clockid; + sem_t s; + struct timespec ts; + + TEST_COMPARE (sem_init (&s, 0, 1), 0); + TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0); + + /* We wait for half a second. */ + xclock_gettime (clockid_for_get, &ts); + ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2)); + + errno = 0; + TEST_COMPARE (TEMP_FAILURE_RETRY ((clockid == CLOCK_USE_TIMEDWAIT) + ? sem_timedwait (&s, &ts) + : sem_clockwait (&s, clockid, &ts)), -1); + TEST_COMPARE (errno, ETIMEDOUT); + TEST_TIMESPEC_NOW_OR_AFTER (clockid_for_get, ts); +} + +static int do_test (void) +{ + do_test_clock (CLOCK_USE_TIMEDWAIT); + do_test_clock (CLOCK_REALTIME); + do_test_clock (CLOCK_MONOTONIC); + return 0; +} + +#include <support/test-driver.c> |