public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc/azanella/futex-refactor] linux: Return EINVAL for invalid clock for pthread_clockjoin_np
@ 2020-11-23 20:49 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2020-11-23 20:49 UTC (permalink / raw)
To: glibc-cvs
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
* [glibc/azanella/futex-refactor] linux: Return EINVAL for invalid clock for pthread_clockjoin_np
@ 2020-11-23 21:08 Adhemerval Zanella
0 siblings, 0 replies; 2+ messages in thread
From: Adhemerval Zanella @ 2020-11-23 21:08 UTC (permalink / raw)
To: glibc-cvs
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>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2020-11-23 21:08 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-23 20:49 [glibc/azanella/futex-refactor] linux: Return EINVAL for invalid clock for pthread_clockjoin_np Adhemerval Zanella
2020-11-23 21:08 Adhemerval Zanella
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).