mirror of https://gitee.com/Nocallback/glibc.git
Browse Source
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>nsz/mathvec
Mike Crowe
7 years ago
committed by
Adhemerval Zanella
Adhemerval Zanella
35 changed files with 267 additions and 27 deletions
@ -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> |
|||
Loading…
Reference in new issue