mirror of
git://sourceware.org/git/glibc.git
synced 2024-11-21 01:12:26 +08:00
9d20e22e46
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. Reviewed-by: Adhemerval Zanella <adhemerval.zanella@linaro.org>
120 lines
3.7 KiB
C
120 lines
3.7 KiB
C
/* Copyright (C) 2002-2019 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
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <pthread.h>
|
|
#include <stdio.h>
|
|
#include <time.h>
|
|
#include <unistd.h>
|
|
#include <sys/time.h>
|
|
#include <stdint.h>
|
|
#include <config.h>
|
|
#include <support/check.h>
|
|
#include <support/timespec.h>
|
|
|
|
|
|
#ifndef TYPE
|
|
# 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_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);
|
|
|
|
#ifdef ENABLE_PI
|
|
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT), 0);
|
|
#endif
|
|
|
|
int err = pthread_mutex_init (&m, &a);
|
|
if (err != 0)
|
|
{
|
|
#ifdef ENABLE_PI
|
|
if (err == ENOTSUP)
|
|
FAIL_UNSUPPORTED ("PI mutexes unsupported");
|
|
#endif
|
|
FAIL_EXIT1 ("mutex_init failed");
|
|
}
|
|
|
|
TEST_COMPARE (pthread_mutexattr_destroy (&a), 0);
|
|
TEST_COMPARE (pthread_mutex_lock (&m), 0);
|
|
if (pthread_mutex_trylock (&m) == 0)
|
|
FAIL_EXIT1 ("mutex_trylock succeeded");
|
|
|
|
/* Wait 2 seconds. */
|
|
struct timespec ts_timeout = timespec_add (xclock_now (clockid_for_get),
|
|
make_timespec (2, 0));
|
|
|
|
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;
|
|
|
|
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);
|
|
|
|
/* Wait 2 seconds. */
|
|
ts_timeout = timespec_add (ts_start, make_timespec (2, 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 (clockid_for_get);
|
|
|
|
/* Check that timedlock didn't delay. We use a limit of 0.1 secs. */
|
|
TEST_TIMESPEC_BEFORE (ts_end,
|
|
timespec_add (ts_start, make_timespec (0, 100000000)));
|
|
|
|
TEST_COMPARE (pthread_mutex_unlock (&m), 0);
|
|
TEST_COMPARE (pthread_mutex_destroy (&m), 0);
|
|
|
|
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>
|