nptl: 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.

Reviewed-by: Lukasz Majewski <lukma@denx.de>

diff --git a/manual/threads.texi b/manual/threads.texi
index 5bcfe32d6a965d917f101cfc86d3d5894de2e9ac..06b6b277a1228af14f8cd49471c2604cab5e3f03 100644 (file)
--- a/manual/threads.texi
+++ b/manual/threads.texi
@@ -842,6 +842,8 @@ will wait forever in the same way as @code{pthread_join}.
 @safety{@prelim{}@mtsafe{}@asunsafe{@asulock{}}@acunsafe{@aculock{}}}
 Behaves like @code{pthread_timedjoin_np} except that the absolute time in
 @var{abstime} is measured against the clock specified by @var{clockid}.
+Currently, @var{clockid} must be either @code{CLOCK_MONOTONIC} or
+@code{CLOCK_REALTIME}.
 @end deftypefun
 
 @node Single-Threaded

diff --git a/nptl/pthread_clockjoin.c b/nptl/pthread_clockjoin.c
index 0baba1e83d14a8641abe52450adc6daa1aaae6dd..3d54fe588fb26d12ec5a4fcb8737915cf8557f6d 100644 (file)
--- 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 45a15b0b1a1f9446d59f9223a0dcb6146d3099b4..8f335c13b510866dfeee7d955b7a1ce554118622 100644 (file)
--- 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 (file)
index 0000000..94e523f
--- /dev/null
+++ b/sysdeps/pthread/tst-join15.c
@@ -0,0 +1,85 @@
+/* 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++)
+    {
+      /* Create a valid timeout to check for ETIMEDOUT on valid clocks.  */
+      struct timespec tmo;
+      if (clock_gettime (clocks[t], &tmo) == -1)
+       /* For clocks not supported, create a large timeout (it should
+          fail early with EINVAL).  */
+       tmo = make_timespec (-1, 0);
+      else
+       tmo = timespec_add (tmo, 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>