From: Mike Crowe <mac@mcrowe.com>
To: libc-alpha@sourceware.org
Cc: Mike Crowe <mac@mcrowe.com>
Subject: [PATCH v2 4/4] nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test
Date: Wed, 18 Sep 2019 13:30:56 +0100 [thread overview]
Message-ID: <0d0a534e12cff0380533a599ed8d905c34b2de19.1568809830.git-series.mac@mcrowe.com> (raw)
In-Reply-To: <cover.3b6b26e85a044f5ad7494dfb035620d75eb57c63.1568809830.git-series.mac@mcrowe.com>
Passing NULL as the timeout parameter to pthread_timedjoin_np has resulted
in it behaving like pthread_join for a long time. Since that is now the
documented behaviour, we ought to test that both it and the new
pthread_clockjoin_np support it.
* nptl/tst-join14.c: Test passing NULL as abstime parameter of
pthread_timedjoin_np and pthread_clockjoin_np.
* nptl/Makefile: Add tst-join14.c.
---
ChangeLog | 5 +++-
nptl/Makefile | 1 +-
nptl/tst-join14.c | 73 ++++++++++++++++++++++++++++++++++++++++++++++++-
3 files changed, 79 insertions(+)
create mode 100644 nptl/tst-join14.c
diff --git a/ChangeLog b/ChangeLog
index 8a2166d..048c4b2 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
2019-09-18 Mike Crowe <mac@mcrowe.com>
+ * nptl/tst-join14.c: Test passing NULL as abstime parameter of
+ pthread_timedjoin_np and pthread_clockjoin_np.
+ * nptl/Makefile: Add tst-join14.c.
+
+2019-09-18 Mike Crowe <mac@mcrowe.com>
* NEWS: Mention addition of pthread_clockjoin_np along with other
"clock" variants of existing "timed" functions.
* sysdeps/nptl/pthread.h: Add declaration of pthread_clockjoin_np.
diff --git a/nptl/Makefile b/nptl/Makefile
index 5521a58..3e05b79 100644
--- a/nptl/Makefile
+++ b/nptl/Makefile
@@ -275,6 +275,7 @@ tests = tst-attr1 tst-attr2 tst-attr3 tst-default-attr \
tst-raise1 \
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-detach1 \
tst-eintr2 tst-eintr3 tst-eintr4 tst-eintr5 \
tst-tsd1 tst-tsd2 tst-tsd3 tst-tsd4 tst-tsd5 tst-tsd6 \
diff --git a/nptl/tst-join14.c b/nptl/tst-join14.c
new file mode 100644
index 0000000..261b919
--- /dev/null
+++ b/nptl/tst-join14.c
@@ -0,0 +1,73 @@
+/* Copyright (C) 2019 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 <errno.h>
+#include <pthread.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/time.h>
+#include <support/check.h>
+#include <support/timespec.h>
+#include <support/xthread.h>
+#include <support/xtime.h>
+
+
+#define CLOCK_USE_TIMEDJOIN (-1)
+
+
+static void *
+tf (void *arg)
+{
+ struct timespec ts = make_timespec(0, 100000);
+ nanosleep(&ts, NULL);
+
+ return (void *) 42l;
+}
+
+
+/* Check that pthread_timedjoin_np and pthread_clockjoin_np wait "forever" if
+ * passed a timeout parameter of NULL. We can't actually wait forever, but we
+ * can be sure that we did at least wait for some time by checking the exit
+ * status of the thread. */
+static int
+do_test_clock (clockid_t clockid)
+{
+ pthread_t th = xpthread_create (NULL, tf, NULL);
+
+ void *status;
+ int val = (clockid == CLOCK_USE_TIMEDJOIN)
+ ? pthread_timedjoin_np (th, &status, NULL)
+ : pthread_clockjoin_np (th, &status, clockid, NULL);
+ TEST_COMPARE (val, 0);
+
+ if (status != (void *) 42l)
+ FAIL_EXIT1 ("return value %p, expected %p\n", status, (void *) 42l);
+
+ return 0;
+}
+
+static int
+do_test (void)
+{
+ do_test_clock (CLOCK_USE_TIMEDJOIN);
+ do_test_clock (CLOCK_REALTIME);
+ do_test_clock (CLOCK_MONOTONIC);
+ return 0;
+}
+
+#include <support/test-driver.c>
--
git-series 0.9.1
next prev parent reply other threads:[~2019-09-18 12:31 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-18 12:30 [PATCH v2 0/4] nptl: Add pthread_clockjoin_np Mike Crowe
2019-09-18 12:30 ` [PATCH v2 1/4] nptl: Convert tst-join3 to use libsupport Mike Crowe
2019-09-26 20:45 ` Adhemerval Zanella
2019-09-18 12:30 ` [PATCH v2 2/4] manual: Add documentation for pthread_tryjoin_np and pthread_timedjoin_np Mike Crowe
2019-09-26 21:26 ` Adhemerval Zanella
2019-09-27 9:08 ` Yann Droneaud
2019-09-28 8:53 ` Mike Crowe
2019-10-14 19:15 ` Adhemerval Zanella
2019-10-18 16:28 ` Mike Crowe
2019-10-21 18:15 ` Adhemerval Zanella
2019-09-18 12:30 ` [PATCH v2 3/4] nptl: Add pthread_clockjoin_np Mike Crowe
2019-09-26 23:17 ` Adhemerval Zanella
2019-09-28 19:45 ` Mike Crowe
2019-10-14 19:16 ` Adhemerval Zanella
2019-10-08 8:26 ` Mike Crowe
2019-09-18 12:30 ` Mike Crowe [this message]
2019-09-26 23:30 ` [PATCH v2 4/4] nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test Adhemerval Zanella
2019-10-31 14:31 ` [PATCH v2 0/4] nptl: Add pthread_clockjoin_np Adhemerval Zanella
2019-10-31 19:38 ` Mike Crowe
2019-10-31 20:51 ` Adhemerval Zanella
2019-11-01 21:05 ` Joseph Myers
2019-11-01 23:01 ` Rafal Luzynski
2019-11-02 9:14 ` Mike Crowe
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
List information: https://www.gnu.org/software/libc/involved.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=0d0a534e12cff0380533a599ed8d905c34b2de19.1568809830.git-series.mac@mcrowe.com \
--to=mac@mcrowe.com \
--cc=libc-alpha@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: link
Be 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).