mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-02 01:40:07 +00:00
28cada0418
* htl/pt-join.c (__pthread_join): Move implementation to... (__pthread_join_common): ... new function. Add try, timed and clock support. (__pthread_join): Reimplement on top of __pthread_join_common. (__pthread_tryjoin_np, __pthread_timedjoin_np, __pthread_clockjoin_np): Implement on top of __pthread_join_common. (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np): New aliases. * hurd/hurdlock.c (__lll_abstimed_wait, __lll_abstimed_xwait, __lll_abstimed_lock): Check for supported clock. * sysdeps/htl/pt-cond-timedwait.c (__pthread_cond_timedwait_internal): Add clockid parameter and support it. (__pthread_cond_timedwait): Pass -1 as clockid. (__pthread_cond_clockwait): New function. (pthread_cond_clockwait): New alias. * sysdeps/htl/pt-cond-wait.c (__pthread_cond_timedwait_internal): Update prototype. (__pthread_cond_wait): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedrdlock.c (__pthread_rwlock_timedrdlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockrdlock): New function. (pthread_rwlock_clockrdlock): New alias. * sysdeps/htl/pt-rwlock-rdlock.c (__pthread_rwlock_timedrdlock_internal): Update prototype. (__pthread_rwlock_rdlock): Pass -1 as clockid. * sysdeps/htl/pt-rwlock-timedwrlock.c (__pthread_rwlock_timedwrlock_internal): Add clockid parameter, and support id. (__pthread_rwlock_clockwrlock): New function. (pthread_rwlock_clockwrlock): New alias. * sysdeps/htl/pt-rwlock-wrlock.c (__pthread_rwlock_timedwrlock_internal): Update prototype. (__pthread_rwlock_wrlock): Pass -1 as clockid. * sysdeps/mach/hurd/htl/pt-mutex-timedlock.c (__pthread_mutex_timedlock): Move implementation to (__pthread_mutex_clocklock): New function with additional clockid parameter and support it. (pthread_mutex_clocklock): New alias. (__pthread_mutex_timedlock): Reimplement on top of __pthread_mutex_clocklock. * sysdeps/htl/pthread.h (pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np, pthread_mutex_clocklock, pthread_cond_clockwait, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock): New prototypes. * sysdeps/htl/pthreadP.h (__pthread_cond_clockwait): New prototype. * htl/Versions (GLIBC_2.32): Add pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_tryjoin_np, pthread_timedjoin_np, pthread_clockjoin_np. * sysdeps/mach/hurd/i386/libpthread.abilist (pthread_clockjoin_np, pthread_cond_clockwait, pthread_mutex_clocklock, pthread_rwlock_clockrdlock, pthread_rwlock_clockwrlock, pthread_timedjoin_np, pthread_tryjoin_np): New functions. * nptl/tst-abstime.c, nptl/tst-join10.c, nptl/tst-join11.c, nptl/tst-join12.c, nptl/tst-join13.c, nptl/tst-join14.c, nptl/tst-join2.c, nptl/tst-join3.c, nptl/tst-join8.c, nptl/tst-join9.c, nptl/tst-mutex-errorcheck.c, nptl/tst-pthread-mutexattr.c, nptl/tst-mutex11.c, nptl/tst-mutex5.c, nptl/tst-mutex7.c, nptl/tst-mutex7robus.c, nptl/tst-mutex9.c, nptl/tst-rwlock12.c, nptl/tst-rwlock14.c: Move to sysdeps/pthread. * sysdeps/pthread/tst-mutex8.c: Move back to nptl. * nptl/Makefile (tests): Move tst-mutex5, tst-mutex7, tst-mutex7robust, tst-mutex9, tst-mutex11, tst-rwlock12, tst-rwlock14, tst-join2, tst-join3, tst-join8, tst-join9 tst-join10, tst-join11, tst-join12, tst-join13, tst-join14, tst-abstime, tst-mutex-errorcheck, tst-pthread-mutexattr to ... * sysdeps/pthread/Makefile (tests): ... here.
120 lines
3.7 KiB
C
120 lines
3.7 KiB
C
/* 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 <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>
|