mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-26 23:10:06 +00:00
71eeae0325
The878fe624d4changed lll_futex_timed_wait, which expects a relative timeout, with a __futex_abstimed_wait64, which expects an absolute timeout. However the code still passes a relative timeout. Also, the PTHREAD_PRIO_PROTECT support for clocks different than CLOCK_REALTIME was broken since the inclusion of pthread_mutex_clocklock (9d20e22e46) since lll_futex_timed_wait always use CLOCK_REALTIME. This patch fixes by removing the relative time calculation. It also adds some xtests that tests both thread and inter-process usage. Checked on x86_64-linux-gnu.
132 lines
4.0 KiB
C
132 lines
4.0 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>
|
|
|
|
#ifdef ENABLE_PP
|
|
#include "tst-tpp.h"
|
|
#endif
|
|
|
|
#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);
|
|
|
|
#if defined ENABLE_PI
|
|
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_INHERIT), 0);
|
|
#elif defined ENABLE_PP
|
|
TEST_COMPARE (pthread_mutexattr_setprotocol (&a, PTHREAD_PRIO_PROTECT), 0);
|
|
TEST_COMPARE (pthread_mutexattr_setprioceiling (&a, 6), 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)
|
|
{
|
|
#ifdef ENABLE_PP
|
|
init_tpp_test ();
|
|
#endif
|
|
|
|
do_test_clock (CLOCK_USE_TIMEDLOCK, "timedlock");
|
|
do_test_clock (CLOCK_REALTIME, "clocklock(realtime)");
|
|
#ifndef ENABLE_PI
|
|
do_test_clock (CLOCK_MONOTONIC, "clocklock(monotonic)");
|
|
#endif
|
|
return 0;
|
|
}
|
|
|
|
#include <support/test-driver.c>
|