mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-26 04:31:03 +00:00
6615f77978
Add: int sem_clockwait (sem_t *sem, clockid_t clock, const struct timespec *abstime) which behaves just like sem_timedwait, but measures abstime against the specified clock. Currently supports CLOCK_REALTIME and CLOCK_MONOTONIC and sets errno == EINVAL if any other clock is specified. * nptl/sem_waitcommon.c (do_futex_wait, __new_sem_wait_slow): Add clockid parameters to indicate the clock which abstime should be measured against. * nptl/sem_timedwait.c (sem_timedwait), nptl/sem_wait.c (__new_sem_wait): Pass CLOCK_REALTIME as clockid to __new_sem_wait_slow. * nptl/sem_clockwait.c: New file to implement sem_clockwait based on sem_timedwait.c. * nptl/Makefile: Add sem_clockwait.c source file. Add CFLAGS for sem_clockwait.c to match those used for sem_timedwait.c. * sysdeps/pthread/semaphore.h: Add sem_clockwait. * nptl/Versions (GLIBC_2.30): Likewise. * 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. * nptl/tst-sem17.c: Add new test for passing invalid clock to sem_clockwait. * nptl/tst-sem13.c, nptl/tst-sem5.c: Modify existing sem_timedwait tests to also test sem_clockwait. * manual/threads.texi: Document sem_clockwait. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
102 lines
3.1 KiB
C
102 lines
3.1 KiB
C
/* sem_wait -- wait on a semaphore. Generic futex-using version.
|
|
Copyright (C) 2003-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Paul Mackerras <paulus@au.ibm.com>, 2003.
|
|
|
|
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 <lowlevellock.h> /* lll_futex* used by the old code. */
|
|
#include "sem_waitcommon.c"
|
|
|
|
int
|
|
__new_sem_wait (sem_t *sem)
|
|
{
|
|
/* We need to check whether we need to act upon a cancellation request here
|
|
because POSIX specifies that cancellation points "shall occur" in
|
|
sem_wait and sem_timedwait, which also means that they need to check
|
|
this regardless whether they block or not (unlike "may occur"
|
|
functions). See the POSIX Rationale for this requirement: Section
|
|
"Thread Cancellation Overview" [1] and austin group issue #1076 [2]
|
|
for thoughs on why this may be a suboptimal design.
|
|
|
|
[1] http://pubs.opengroup.org/onlinepubs/9699919799/xrat/V4_xsh_chap02.html
|
|
[2] http://austingroupbugs.net/view.php?id=1076 for thoughts on why this
|
|
*/
|
|
__pthread_testcancel ();
|
|
|
|
if (__new_sem_wait_fast ((struct new_sem *) sem, 0) == 0)
|
|
return 0;
|
|
else
|
|
return __new_sem_wait_slow ((struct new_sem *) sem,
|
|
CLOCK_REALTIME, NULL);
|
|
}
|
|
versioned_symbol (libpthread, __new_sem_wait, sem_wait, GLIBC_2_1);
|
|
|
|
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
|
|
int
|
|
attribute_compat_text_section
|
|
__old_sem_wait (sem_t *sem)
|
|
{
|
|
int *futex = (int *) sem;
|
|
int err;
|
|
|
|
do
|
|
{
|
|
if (atomic_decrement_if_positive (futex) > 0)
|
|
return 0;
|
|
|
|
/* Always assume the semaphore is shared. */
|
|
err = lll_futex_wait_cancel (futex, 0, LLL_SHARED);
|
|
}
|
|
while (err == 0 || err == -EWOULDBLOCK);
|
|
|
|
__set_errno (-err);
|
|
return -1;
|
|
}
|
|
|
|
compat_symbol (libpthread, __old_sem_wait, sem_wait, GLIBC_2_0);
|
|
#endif
|
|
|
|
int
|
|
__new_sem_trywait (sem_t *sem)
|
|
{
|
|
/* We must not fail spuriously, so require a definitive result even if this
|
|
may lead to a long execution time. */
|
|
if (__new_sem_wait_fast ((struct new_sem *) sem, 1) == 0)
|
|
return 0;
|
|
__set_errno (EAGAIN);
|
|
return -1;
|
|
}
|
|
versioned_symbol (libpthread, __new_sem_trywait, sem_trywait, GLIBC_2_1);
|
|
#if SHLIB_COMPAT (libpthread, GLIBC_2_0, GLIBC_2_1)
|
|
int
|
|
__old_sem_trywait (sem_t *sem)
|
|
{
|
|
int *futex = (int *) sem;
|
|
int val;
|
|
|
|
if (*futex > 0)
|
|
{
|
|
val = atomic_decrement_if_positive (futex);
|
|
if (val > 0)
|
|
return 0;
|
|
}
|
|
|
|
__set_errno (EAGAIN);
|
|
return -1;
|
|
}
|
|
compat_symbol (libpthread, __old_sem_trywait, sem_trywait, GLIBC_2_0);
|
|
#endif
|