From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-ASN: AS31976 209.132.180.0/23 X-Spam-Status: No, score=-3.9 required=3.0 tests=AWL,BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,HEADER_FROM_DIFFERENT_DOMAINS, MAILING_LIST_MULTI,RCVD_IN_DNSWL_MED,SPF_HELO_PASS,SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 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 dcvr.yhbt.net (Postfix) with ESMTPS id A1ACE1F45F for ; Thu, 9 May 2019 16:56:08 +0000 (UTC) DomainKey-Signature: a=rsa-sha1; c=nofws; d=sourceware.org; h=list-id :list-unsubscribe:list-subscribe:list-archive:list-post :list-help:sender:subject:to:references:from:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; q=dns; s=default; b=yw5FPvbDH06lr8Bo DKO2VBlx/lei3XQahEpU/7IlsTKsZ6P+eeFZG4gK8xWzZvXaJne8c+CwPoN00hok pqtvuJe1UE8DSmiaNLKKFLaMOg8J/seJgZIyMIcsRxkaF96NyQhtNNJdrXGLnaxZ ajaH6Ah71kPtEUjI0evjvox7qzM= 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:subject:to:references:from:message-id:date :mime-version:in-reply-to:content-type :content-transfer-encoding; s=default; bh=MshPMQYjmd9LOAz3FT3nNK ic/go=; b=iNCRk25JXxaz2XvZm6wS0KV4b0KF/KKvdsFjiEWdrjBEU5ZOqSBZa5 oPaAFSQ2O6wLpD9MZJZw3n2O7YBQ7gK3bo+MLcxOWEN1WA/qgKNibJSM6ISQzQei sWAFWY/TdqzI/uh/SURUBYTJfy5ZhreLg+VYXFw0/tiiXybpY/n+Q= Received: (qmail 130194 invoked by alias); 9 May 2019 16:55:58 -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 Received: (qmail 130112 invoked by uid 89); 9 May 2019 16:55:58 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-vs1-f66.google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=subject:to:references:from:openpgp:autocrypt:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=KEUjDYwpgiVUEu7H3lCkLqSO2zELN9HvrK/e5jcVsKI=; b=UJnbwmsCosGr9SLk1jVkRk6u7SCi2snqb5/zqXoYGP2iyeIzPIEP6lIPe8qjX6c4+W QjNO1qUvV8LUQTMiQ54ZhOaUALWKzv4LYsteNhS/OX2pZjWfDUc9S1GiFrODVsOprPkA ZzJ5oVPh6gs4hvFO3VFi94sqeTMyntmpk9wa7ZaQQC3ttQVY0PvCJMkBU+MvlJpXWCzb +KjE3vg8UFkO3ERCbYW5grMzqd8r0B8MbqF6jV0qD3Fgf4EzBMsjEQ7rZM7oknSAoHYk n3Tte3GlLbNeeXqRtFyuDUnKKVLt1Gno6cng9iHb+HQBm6i9wvApuAdsgP/06lokImCP Wg/w== Subject: Re: [PATCH 3/5] nptl: Use recent additions to libsupport in tst-sem5 To: libc-alpha@sourceware.org References: <6a2761067dfdedc077e90a3e0ca56473a8cd9934.1556830454.git-series.mac@mcrowe.com> From: Adhemerval Zanella Openpgp: preference=signencrypt Message-ID: <2a21a27e-6dcf-bce0-6976-90031b175a95@linaro.org> Date: Thu, 9 May 2019 13:55:51 -0300 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.6.1 MIME-Version: 1.0 In-Reply-To: <6a2761067dfdedc077e90a3e0ca56473a8cd9934.1556830454.git-series.mac@mcrowe.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 02/05/2019 17:54, Mike Crowe wrote: > * nptl/tst-sem5.c(do_test): Use xclock_gettime, timespec_add and > TEST_TIMESPEC_NOW_OR_AFTER from libsupport. LGTM. I will push it for you. > --- > ChangeLog | 5 +++++ > nptl/tst-sem5.c | 21 +++++---------------- > 2 files changed, 10 insertions(+), 16 deletions(-) > > diff --git a/ChangeLog b/ChangeLog > index cd0ef83..088076d 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,5 +1,10 @@ > 2019-05-02 Mike Crowe > > + * nptl/tst-sem5.c(do_test): Use xclock_gettime, timespec_add and > + TEST_TIMESPEC_NOW_OR_AFTER from libsupport. > + > +2019-05-02 Mike Crowe > + > * support/timespec.h: New file. Provide timespec helper functions > along with macros in the style of those in check.h. > > diff --git a/nptl/tst-sem5.c b/nptl/tst-sem5.c > index 50ab6f9..396222b 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,18 @@ 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; > } >