public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/futex-refactor] linux: Return EINVAL for invalid clock for pthread_clockjoin_np Date: Mon, 23 Nov 2020 20:49:30 +0000 (GMT) [thread overview] Message-ID: <20201123204930.E7202382E06C@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=686d38b35e0a21c2fa37b5d3bf212b4a4611d260 commit 686d38b35e0a21c2fa37b5d3bf212b4a4611d260 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> Date: Mon Nov 23 13:47:18 2020 -0300 linux: Return EINVAL for invalid clock for pthread_clockjoin_np The align the GNU extension with the others one that accept specify which clock to wait for (such as pthread_mutex_clocklock). Check on x86_64-linux-gnu. Diff: --- nptl/pthread_clockjoin.c | 4 +++ sysdeps/pthread/Makefile | 2 +- sysdeps/pthread/tst-join15.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ 3 files changed, 85 insertions(+), 1 deletion(-) diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c index 0baba1e83d..3d54fe588f 100644 --- a/nptl/pthread_clockjoin.c +++ b/nptl/pthread_clockjoin.c @@ -17,12 +17,16 @@ <http://www.gnu.org/licenses/>. */ #include <time.h> +#include <futex-internal.h> #include "pthreadP.h" int __pthread_clockjoin_np64 (pthread_t threadid, void **thread_return, clockid_t clockid, const struct __timespec64 *abstime) { + if (!futex_abstimed_supported_clockid (clockid)) + return EINVAL; + return __pthread_clockjoin_ex (threadid, thread_return, clockid, abstime, true); } diff --git a/sysdeps/pthread/Makefile b/sysdeps/pthread/Makefile index 45a15b0b1a..8f335c13b5 100644 --- a/sysdeps/pthread/Makefile +++ b/sysdeps/pthread/Makefile @@ -77,7 +77,7 @@ tests += tst-cnd-basic tst-mtx-trylock tst-cnd-broadcast \ tst-getpid3 \ tst-join1 tst-join2 tst-join3 tst-join4 tst-join5 tst-join6 tst-join7 \ tst-join8 tst-join9 tst-join10 tst-join11 tst-join12 tst-join13 \ - tst-join14 \ + tst-join14 tst-join15 \ tst-key1 tst-key2 tst-key3 tst-key4 \ tst-kill1 tst-kill2 tst-kill3 tst-kill4 tst-kill5 tst-kill6 \ tst-locale1 tst-locale2 \ diff --git a/sysdeps/pthread/tst-join15.c b/sysdeps/pthread/tst-join15.c new file mode 100644 index 0000000000..4ed767e733 --- /dev/null +++ b/sysdeps/pthread/tst-join15.c @@ -0,0 +1,80 @@ +/* Check pthread_clockjoin_np clock support. + Copyright (C) 2020 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 + <https://www.gnu.org/licenses/>. */ + +#include <pthread.h> +#include <sys/time.h> +#include <unistd.h> +#include <errno.h> + +#include <array_length.h> +#include <support/check.h> +#include <support/timespec.h> +#include <support/xthread.h> + +static void * +tf (void *arg) +{ + pause (); + return NULL; +} + + +static int +do_test (void) +{ + const clockid_t clocks[] = { + CLOCK_REALTIME, + CLOCK_MONOTONIC, + CLOCK_PROCESS_CPUTIME_ID, + CLOCK_THREAD_CPUTIME_ID, + CLOCK_THREAD_CPUTIME_ID, + CLOCK_MONOTONIC_RAW, + CLOCK_REALTIME_COARSE, + CLOCK_MONOTONIC_COARSE, +#ifdef CLOCK_BOOTTIME + CLOCK_BOOTTIME, +#endif +#ifdef CLOCK_REALTIME_ALARM + CLOCK_REALTIME_ALARM, +#endif +#ifdef CLOCK_BOOTTIME_ALARM + CLOCK_BOOTTIME_ALARM, +#endif +#ifdef CLOCK_TAI + CLOCK_TAI +#endif + }; + + pthread_t thr = xpthread_create (NULL, tf, NULL); + + for (int t = 0; t < array_length (clocks); t++) + { + /* A valid timeout so valid clock timeout. */ + struct timespec tmo = timespec_add (xclock_now (clocks[t]), + make_timespec (0, 100000000)); + + int ret = clocks[t] == CLOCK_REALTIME || clocks[t] == CLOCK_MONOTONIC + ? ETIMEDOUT : EINVAL; + + TEST_COMPARE (pthread_clockjoin_np (thr, NULL, clocks[t], &tmo), ret); + } + + return 0; +} + +#include <support/test-driver.c>
next reply other threads:[~2020-11-23 20:49 UTC|newest] Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-11-23 20:49 Adhemerval Zanella [this message] 2020-11-23 21:08 Adhemerval Zanella
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20201123204930.E7202382E06C@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).