lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-08-01 10:06:57 +03:00
Code Activity

htl: Add sem_clockwait support

Browse Source 
* sysdeps/htl/sem-timedwait.c (__sem_timedwait_internal): Add clock_id
parameter instead of hardcoding CLOCK_REALTIME.
(__sem_clockwait): New function.
(sem_clockwait): New weak alias.
* sysdeps/htl/sem-wait.c (__sem_timedwait_internal): Update declaration.
(__sem_wait): Update call to __sem_timedwait_internal.
* htl/Versions (GLIBC_2.32): Add sem_clockwait.
* sysdeps/mach/hurd/i386/libpthread.abilist (sem_clockwait): Add symbol.
* nptl/Makefile (tests): Move tst-sem5 to...
* sysdeps/pthread/Makefile (tests): ... here.
This commit is contained in:
Samuel Thibault
2020-06-07 03:12:36 +02:00
parent 6c5ca98d09
commit be22a151f3
7 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sysdeps/pthread/Makefile
View File

@ -64,7 +64,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \
tst-rwlock1 tst-rwlock4 tst-rwlock5 tst-rwlock12 \
tst-rwlock13 tst-rwlock14 tst-rwlock16 \
tst-rwlock-tryrdlock-stall tst-rwlock-trywrlock-stall \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem6 tst-sem7 \
tst-sem1 tst-sem2 tst-sem3 tst-sem4 tst-sem5 tst-sem6 tst-sem7 \
tst-sem8 tst-sem9 tst-sem10 tst-sem14 tst-sem15 tst-sem16 \
tst-spin1 tst-spin2 tst-spin3 tst-spin4 \
tst-abstime

63
sysdeps/pthread/tst-sem5.c Normal file
View File

@ -0,0 +1,63 @@
/* 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 <semaphore.h>
#include <time.h>
#include <unistd.h>
#include <sys/time.h>
#include <support/check.h>
#include <support/timespec.h>
#include <support/xtime.h>
/* A bogus clock value that tells run_test to use sem_timedwait rather than
sem_clockwait. */
#define CLOCK_USE_TIMEDWAIT (-1)
static void
do_test_clock (clockid_t clockid)
{
const clockid_t clockid_for_get =
clockid == CLOCK_USE_TIMEDWAIT ? CLOCK_REALTIME : clockid;
sem_t s;
struct timespec ts;
TEST_COMPARE (sem_init (&s, 0, 1), 0);
TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0);
/* We wait for half a second. */
xclock_gettime (clockid_for_get, &ts);
ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2));
errno = 0;
TEST_COMPARE (TEMP_FAILURE_RETRY ((clockid == CLOCK_USE_TIMEDWAIT)
? sem_timedwait (&s, &ts)
: sem_clockwait (&s, clockid, &ts)), -1);
TEST_COMPARE (errno, ETIMEDOUT);
TEST_TIMESPEC_NOW_OR_AFTER (clockid_for_get, ts);
}
static int do_test (void)
{
do_test_clock (CLOCK_USE_TIMEDWAIT);
do_test_clock (CLOCK_REALTIME);
do_test_clock (CLOCK_MONOTONIC);
return 0;
}
#include <support/test-driver.c>