From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 80469 invoked by alias); 31 Oct 2019 13:11:04 -0000 Mailing-List: contact glibc-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: , Sender: glibc-cvs-owner@sourceware.org List-Subscribe: Received: (qmail 80452 invoked by uid 9943); 31 Oct 2019 13:11:04 -0000 Date: Thu, 31 Oct 2019 13:11:00 -0000 Message-ID: <20191031131104.80451.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc/azanella/pthread_clockjoin_np] nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test X-Act-Checkin: glibc X-Git-Author: Mike Crowe X-Git-Refname: refs/heads/azanella/pthread_clockjoin_np X-Git-Oldrev: 9a17fe3be625a9ecf176ae4b62e59f967468253d X-Git-Newrev: 2298539e19d9217e3e94a348bfcdc260d239ee36 X-SW-Source: 2019-q4/txt/msg00218.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=2298539e19d9217e3e94a348bfcdc260d239ee36 commit 2298539e19d9217e3e94a348bfcdc260d239ee36 Author: Mike Crowe Date: Thu Oct 31 10:05:17 2019 -0300 nptl: Add pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test 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. Checked on x86_64-linux-gnu. Reviewed-by: Adhemerval Zanella Diff: --- nptl/Makefile | 1 + nptl/tst-join14.c | 74 +++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 75 insertions(+) diff --git a/nptl/Makefile b/nptl/Makefile index bbb281e..73b2071 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..6369367 --- /dev/null +++ b/nptl/tst-join14.c @@ -0,0 +1,74 @@ +/* pthread_timedjoin_np, pthread_clockjoin_np NULL timeout test. + 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 + . */ + +#include +#include +#include +#include +#include +#include +#include +#include +#include +#include + + +#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