From patchwork Thu Mar 28 18:31:09 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Crowe X-Patchwork-Id: 32052 Received: (qmail 64151 invoked by alias); 28 Mar 2019 18:31:38 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 64077 invoked by uid 89); 28 Mar 2019 18:31:38 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.6 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=half X-HELO: avasout02.plus.net X-CM-Score: 0.00 From: Mike Crowe To: libc-alpha@sourceware.org Cc: Mike Crowe Subject: [PATCH 3/6] nptl: Convert tst-sem5 & tst-sem13 to use libsupport Date: Thu, 28 Mar 2019 18:31:09 +0000 Message-Id: <807fb7a23ce8ce26c429922643fb2906ba7f0622.1553797867.git-series.mac@mcrowe.com> In-Reply-To: References: In-Reply-To: References: * nptl/tst-sem5.c(do_test): Use xclock_gettime and TEST_TIMESPEC_NOW_OR_AFTER from libsupport. Reviewed-by: Adhemerval Zanella --- ChangeLog | 7 ++++++- nptl/tst-sem5.c | 21 +++++---------------- 2 files changed, 11 insertions(+), 17 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5ceb3a7..436736d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,9 @@ -2019-03-20 Mike Crowe +2019-03-28 Mike Crowe + + * nptl/tst-sem5.c(do_test): Use xclock_gettime and + TEST_TIMESPEC_NOW_OR_AFTER from libsupport. + +2019-03-28 Mike Crowe * support/timespec.h: Create header to provide timespec helper functions from sysdeps/pthread/posix-timer.h and macros in the diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c index 50ab6f9..b27237e 100644 --- a/nptl/tst-sem5.c +++ b/nptl/tst-sem5.c @@ -22,6 +22,7 @@ #include #include #include +#include static int @@ -29,31 +30,19 @@ do_test (void) { sem_t s; struct timespec ts; - struct timeval tv; TEST_COMPARE (sem_init (&s, 0, 1), 0); TEST_COMPARE (TEMP_FAILURE_RETRY (sem_wait (&s)), 0); - TEST_COMPARE (gettimeofday (&tv, NULL), 0); - - TIMEVAL_TO_TIMESPEC (&tv, &ts); + xclock_gettime(CLOCK_REALTIME, &ts); /* We wait for half a second. */ - ts.tv_nsec += 500000000; - if (ts.tv_nsec >= 1000000000) - { - ++ts.tv_sec; - ts.tv_nsec -= 1000000000; - } + const struct timespec ts_delay = { 0, 500000000 }; + timespec_add(&ts, &ts, &ts_delay); errno = 0; TEST_COMPARE (TEMP_FAILURE_RETRY (sem_timedwait (&s, &ts)), -1); TEST_COMPARE (errno, ETIMEDOUT); - - struct timespec ts2; - TEST_COMPARE (clock_gettime (CLOCK_REALTIME, &ts2), 0); - - TEST_VERIFY (ts2.tv_sec > ts.tv_sec - || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec > ts.tv_nsec)); + TEST_TIMESPEC_NOW_OR_AFTER (CLOCK_REALTIME, ts); return 0; }