From patchwork Sun Apr 7 19:33:53 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mike Crowe X-Patchwork-Id: 1080281 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=sourceware.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=libc-alpha-return-101219-incoming=patchwork.ozlabs.org@sourceware.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mcrowe.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; secure) header.d=sourceware.org header.i=@sourceware.org header.b="lkdimnQl"; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 44ckK048QBz9sPq for ; Mon, 8 Apr 2019 05:34:44 +1000 (AEST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; q=dns; s=default; b=ygAO7DFd 4dvL5feTD8fxoz211GiA51Ndu2K/JVnxO4nGhe353PEX1d91HQGztKm5FYHnVfM0 N92KWaprn/mvoP9tDM7fvEhdc65+g08BLAfTwOYCHqQuBJYFq9sTpBnvU/odZm3Z RQcqgY5E8h++4XqheqMd0YYiHw1t7IvYE/4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:from:to:cc:subject:date:message-id:in-reply-to :references:in-reply-to:references; s=default; bh=yj2NSnviv7owz4 QbfGGpPA4xE9I=; b=lkdimnQlrPog0V5PcYU607ETM37ku2ch9kjUURh6Q+G4p3 5wD88uiBk9INUEseXS64AR8IEF5RmvqbcgCJJ4NVcbZ/jnJggBT1fbKoAgfXCSUj w4RZNiO5TKjvew7ucGBLul6nxFZ4Vuhkbzg+0lDRltqnwH1jC+CuB7sj5Avxs= Received: (qmail 81252 invoked by alias); 7 Apr 2019 19:34:31 -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 81197 invoked by uid 89); 7 Apr 2019 19:34:31 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-22.4 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_NUMSUBJECT, RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.1 spammy=500000000, half X-HELO: avasout03.plus.net X-CM-Score: 0.00 From: Mike Crowe To: libc-alpha@sourceware.org Cc: Mike Crowe Subject: [PATCH v2 4/6] nptl: Use recent additions to libsupport in tst-sem5 Date: Sun, 7 Apr 2019 20:33:53 +0100 Message-Id: <357cccd801fc058ed6524664e6c22fb4246f9409.1554665560.git-series.mac@mcrowe.com> In-Reply-To: References: In-Reply-To: References: * nptl/tst-sem5.c(do_test): Use xclock_gettime, timespec_add and TEST_TIMESPEC_NOW_OR_AFTER from libsupport. --- ChangeLog | 5 +++++ nptl/tst-sem5.c | 23 +++++------------------ 2 files changed, 10 insertions(+), 18 deletions(-) diff --git a/ChangeLog b/ChangeLog index 5aafd69..c78863e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,10 @@ 2019-04-06 Mike Crowe + * nptl/tst-sem5.c(do_test): Use xclock_gettime, timespec_add and + TEST_TIMESPEC_NOW_OR_AFTER from libsupport. + +2019-04-06 Mike Crowe + * nptl/tst-cond11.c: Use libsupport. 2019-04-06 Mike Crowe diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c index 50ab6f9..7e722bd 100644 --- a/nptl/tst-sem5.c +++ b/nptl/tst-sem5.c @@ -22,6 +22,8 @@ #include #include #include +#include +#include static int @@ -29,31 +31,16 @@ 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); - - /* We wait for half a second. */ - ts.tv_nsec += 500000000; - if (ts.tv_nsec >= 1000000000) - { - ++ts.tv_sec; - ts.tv_nsec -= 1000000000; - } + xclock_gettime (CLOCK_REALTIME, &ts); + ts = timespec_add (ts, make_timespec (0, TIMESPEC_HZ/2)); 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; }