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 2A9A31F45F for ; Thu, 9 May 2019 16:40:05 +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=ts1ABA+vGYzQRbbv n4cTkm+LQWNkeMBvFEdvjQH0TO+pk+8euX05ZHeFJAb28ObKvlpM9xIQ8UlzoOrr KwJm8l8OKPWxaW4GoewGVIpYXsSnMC9BbmtUV1PRMCEIFtR+h3cja/ePm9NshqKQ R+iKWauS+w1aHqca/oqfgtyIskA= 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=xo5+bq8L5HV+Kd01g9n/ss lHjCs=; b=sVlkHgdYb9plv1tXx183NV474MLyCQphBOWbKcHQHO8y1EHBHF6/92 hNnFfkt2nNL1GDLxKfiNPVGCI+kWW8OJGMoYnCA4TtdP3CRfLer8vUu/f279BSFU TrZKq9nWuMthqN6OX5tedSl+2xY1m83olbxUu67TPSifzJXFq599Q= Received: (qmail 18420 invoked by alias); 9 May 2019 16:40:01 -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 18411 invoked by uid 89); 9 May 2019 16:40:01 -0000 Authentication-Results: sourceware.org; auth=none X-HELO: mail-vs1-f65.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=yhZIAkeUKp2qfw3Pfkom+qYs2QRTJCTAVbcexVcMrzQ=; b=HT5vn5KZLG/guUfPagZ1/iJj9MRM1jZtud7iw1BagTyY+vTNuIyJaXJnTprVcqEwZQ BGLJ2Q+W46++XwjLAnWFe1IccPMQcyBVdY8p9/42bLT4OL6lV2tyqO9cY7jEzKYvMyBG lu/huquGj3zJnBekfTn4Q5XbRaTKaMU4IxvYz4/vOcafcJncF2nPD7FnW3OEklYvpOdE I/yWWtW3LLqD76a0ydpErW61cibGFOCOx7mqhEfbaJzpywxbrwaMyUGMUCS0OVeGKqQX PhOdhi9D9eO0x65XT/uXg2lY0cxk8JXuXIIkzBMhZ/DaP33fRp8FIwbjRzrnHEM2K0z/ a/7Q== Subject: Re: [PATCH 2/5] nptl: Convert tst-cond11.c to use libsupport To: libc-alpha@sourceware.org References: From: Adhemerval Zanella Openpgp: preference=signencrypt Message-ID: Date: Thu, 9 May 2019 13:39:52 -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: Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit On 02/05/2019 17:54, Mike Crowe wrote: > * support/timespec.h: New file. Provide timespec helper functions > along with macros in the style of those in check.h. > > * support/timespec.c: New file. Implement check functions declared > in support/timespec.h. > > * support/timespec-add.c: New file from gnulib containing > timespec_add implementation that handles overflow. > > * support/timespec-sub.c: New file from gnulib containing > timespec_sub implementation that handles overflow. > > * support/README: Mention timespec.h. > > * nptl/tst-cond11.c: Use libsupport. Still LGTM. I will push it for you. > --- > ChangeLog | 18 ++++- > nptl/tst-cond11.c | 169 ++++++++---------------------------------- > support/Makefile | 3 +- > support/README | 5 +- > support/timespec-add.c | 71 ++++++++++++++++++- > support/timespec-sub.c | 71 ++++++++++++++++++- > support/timespec.c | 58 ++++++++++++++- > support/timespec.h | 79 ++++++++++++++++++++- > 8 files changed, 341 insertions(+), 133 deletions(-) > create mode 100644 support/timespec-add.c > create mode 100644 support/timespec-sub.c > create mode 100644 support/timespec.c > create mode 100644 support/timespec.h > > diff --git a/ChangeLog b/ChangeLog > index 6008265..cd0ef83 100644 > --- a/ChangeLog > +++ b/ChangeLog > @@ -1,5 +1,23 @@ > 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. > + > + * support/timespec.c: New file. Implement check functions declared > + in support/timespec.h. > + > + * support/timespec-add.c: New file from gnulib containing > + timespec_add implementation that handles overflow. > + > + * support/timespec-sub.c: New file from gnulib containing > + timespec_sub implementation that handles overflow. > + > + * support/README: Mention timespec.h. > + > + * nptl/tst-cond11.c: Use libsupport. > + > +2019-05-02 Mike Crowe > + > * support/xclock_gettime.c (xclock_gettime): New file. Provide > clock_gettime wrapper for use in tests that fails the test rather > than returning failure. > diff --git a/nptl/tst-cond11.c b/nptl/tst-cond11.c > index 97a8bd0..3bc4ff4 100644 > --- a/nptl/tst-cond11.c > +++ b/nptl/tst-cond11.c > @@ -21,6 +21,10 @@ > #include > #include > #include > +#include > +#include > +#include > +#include > > > #if defined _POSIX_CLOCK_SELECTION && _POSIX_CLOCK_SELECTION >= 0 > @@ -34,132 +38,36 @@ run_test (clockid_t cl) > > printf ("clock = %d\n", (int) cl); > > - if (pthread_condattr_init (&condattr) != 0) > - { > - puts ("condattr_init failed"); > - return 1; > - } > - > - if (pthread_condattr_setclock (&condattr, cl) != 0) > - { > - puts ("condattr_setclock failed"); > - return 1; > - } > + TEST_COMPARE (pthread_condattr_init (&condattr), 0); > + TEST_COMPARE (pthread_condattr_setclock (&condattr, cl), 0); > > clockid_t cl2; > - if (pthread_condattr_getclock (&condattr, &cl2) != 0) > - { > - puts ("condattr_getclock failed"); > - return 1; > - } > - if (cl != cl2) > - { > - printf ("condattr_getclock returned wrong value: %d, expected %d\n", > - (int) cl2, (int) cl); > - return 1; > - } > - > - if (pthread_cond_init (&cond, &condattr) != 0) > - { > - puts ("cond_init failed"); > - return 1; > - } > - > - if (pthread_condattr_destroy (&condattr) != 0) > - { > - puts ("condattr_destroy failed"); > - return 1; > - } > - > - if (pthread_mutexattr_init (&mutattr) != 0) > - { > - puts ("mutexattr_init failed"); > - return 1; > - } > - > - if (pthread_mutexattr_settype (&mutattr, PTHREAD_MUTEX_ERRORCHECK) != 0) > - { > - puts ("mutexattr_settype failed"); > - return 1; > - } > - > - if (pthread_mutex_init (&mut, &mutattr) != 0) > - { > - puts ("mutex_init failed"); > - return 1; > - } > - > - if (pthread_mutexattr_destroy (&mutattr) != 0) > - { > - puts ("mutexattr_destroy failed"); > - return 1; > - } > - > - if (pthread_mutex_lock (&mut) != 0) > - { > - puts ("mutex_lock failed"); > - return 1; > - } > - > - if (pthread_mutex_lock (&mut) != EDEADLK) > - { > - puts ("2nd mutex_lock did not return EDEADLK"); > - return 1; > - } > - > - struct timespec ts; > - if (clock_gettime (cl, &ts) != 0) > - { > - puts ("clock_gettime failed"); > - return 1; > - } > + TEST_COMPARE (pthread_condattr_getclock (&condattr, &cl2), 0); > + TEST_COMPARE (cl, cl2); > + > + TEST_COMPARE (pthread_cond_init (&cond, &condattr), 0); > + TEST_COMPARE (pthread_condattr_destroy (&condattr), 0); > + > + xpthread_mutexattr_init (&mutattr); > + xpthread_mutexattr_settype (&mutattr, PTHREAD_MUTEX_ERRORCHECK); > + xpthread_mutex_init (&mut, &mutattr); > + xpthread_mutexattr_destroy (&mutattr); > + > + xpthread_mutex_lock (&mut); > + TEST_COMPARE (pthread_mutex_lock (&mut), EDEADLK); > + > + struct timespec ts_timeout; > + xclock_gettime (cl, &ts_timeout); > > /* Wait one second. */ > - ++ts.tv_sec; > - > - int e = pthread_cond_timedwait (&cond, &mut, &ts); > - if (e == 0) > - { > - puts ("cond_timedwait succeeded"); > - return 1; > - } > - else if (e != ETIMEDOUT) > - { > - puts ("cond_timedwait did not return ETIMEDOUT"); > - return 1; > - } > - > - struct timespec ts2; > - if (clock_gettime (cl, &ts2) != 0) > - { > - puts ("second clock_gettime failed"); > - return 1; > - } > - > - if (ts2.tv_sec < ts.tv_sec > - || (ts2.tv_sec == ts.tv_sec && ts2.tv_nsec < ts.tv_nsec)) > - { > - puts ("timeout too short"); > - return 1; > - } > - > - if (pthread_mutex_unlock (&mut) != 0) > - { > - puts ("mutex_unlock failed"); > - return 1; > - } > - > - if (pthread_mutex_destroy (&mut) != 0) > - { > - puts ("mutex_destroy failed"); > - return 1; > - } > - > - if (pthread_cond_destroy (&cond) != 0) > - { > - puts ("cond_destroy failed"); > - return 1; > - } > + ++ts_timeout.tv_sec; > + > + TEST_COMPARE (pthread_cond_timedwait (&cond, &mut, &ts_timeout), ETIMEDOUT); > + TEST_TIMESPEC_BEFORE_NOW (ts_timeout, cl); > + > + xpthread_mutex_unlock (&mut); > + xpthread_mutex_destroy (&mut); > + TEST_COMPARE (pthread_cond_destroy (&cond), 0); > > return 0; > } > @@ -171,12 +79,11 @@ do_test (void) > { > #if !defined _POSIX_CLOCK_SELECTION || _POSIX_CLOCK_SELECTION == -1 > > - puts ("_POSIX_CLOCK_SELECTION not supported, test skipped"); > - return 0; > + FAIL_UNSUPPORTED ("_POSIX_CLOCK_SELECTION not supported, test skipped"); > > #else > > - int res = run_test (CLOCK_REALTIME); > + run_test (CLOCK_REALTIME); > > # if defined _POSIX_MONOTONIC_CLOCK && _POSIX_MONOTONIC_CLOCK >= 0 > # if _POSIX_MONOTONIC_CLOCK == 0 > @@ -184,20 +91,16 @@ do_test (void) > if (e < 0) > puts ("CLOCK_MONOTONIC not supported"); > else if (e == 0) > - { > - puts ("sysconf (_SC_MONOTONIC_CLOCK) must not return 0"); > - res = 1; > - } > + FAIL_RET ("sysconf (_SC_MONOTONIC_CLOCK) must not return 0"); > else > # endif > - res |= run_test (CLOCK_MONOTONIC); > + run_test (CLOCK_MONOTONIC); > # else > puts ("_POSIX_MONOTONIC_CLOCK not defined"); > # endif > > - return res; > + return 0; > #endif > } > > -#define TEST_FUNCTION do_test () > -#include "../test-skeleton.c" > +#include > diff --git a/support/Makefile b/support/Makefile > index 05865fe..64044f6 100644 > --- a/support/Makefile > +++ b/support/Makefile > @@ -71,6 +71,9 @@ libsupport-routines = \ > support_test_main \ > support_test_verify_impl \ > temp_file \ > + timespec \ > + timespec-add \ > + timespec-sub \ > write_message \ > xaccept \ > xaccept4 \ > diff --git a/support/README b/support/README > index d82f472..ae2c41c 100644 > --- a/support/README > +++ b/support/README > @@ -28,3 +28,8 @@ header files provide related declarations: > * check.h > * temp_file.h > * test-driver.h > + > +For tests that make use of struct timespec, the following header files > +contain additional macros and helper functions: > + > +* timespec.h > diff --git a/support/timespec-add.c b/support/timespec-add.c > new file mode 100644 > index 0000000..be7a590 > --- /dev/null > +++ b/support/timespec-add.c > @@ -0,0 +1,71 @@ > +/* Add two struct timespec values. > + Copyright (C) 2011-2019 Free Software Foundation, Inc. > + This file is part of the GNU C Library and is also part of gnulib. > + Patches to this file should be submitted to both projects. > + > + 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 > + . */ > + > +/* Return the sum of two timespec values A and B. On overflow, return > + an extremal value. This assumes 0 <= tv_nsec < TIMESPEC_HZ. */ > + > +#include > +#include "timespec.h" > + > +#include "intprops.h" > + > +struct timespec > +timespec_add (struct timespec a, struct timespec b) > +{ > + time_t rs = a.tv_sec; > + time_t bs = b.tv_sec; > + int ns = a.tv_nsec + b.tv_nsec; > + int nsd = ns - TIMESPEC_HZ; > + int rns = ns; > + time_t tmin = TYPE_MINIMUM (time_t); > + time_t tmax = TYPE_MAXIMUM (time_t); > + > + if (0 <= nsd) > + { > + rns = nsd; > + if (bs < tmax) > + bs++; > + else if (rs < 0) > + rs++; > + else > + goto high_overflow; > + } > + > + /* INT_ADD_WRAPV is not appropriate since time_t might be unsigned. > + In theory time_t might be narrower than int, so plain > + INT_ADD_OVERFLOW does not suffice. */ > + if (! INT_ADD_OVERFLOW (rs, bs) && tmin <= rs + bs && rs + bs <= tmax) > + rs += bs; > + else > + { > + if (rs < 0) > + { > + rs = tmin; > + rns = 0; > + } > + else > + { > + high_overflow: > + rs = tmax; > + rns = TIMESPEC_HZ - 1; > + } > + } > + > + return make_timespec (rs, rns); > +} > diff --git a/support/timespec-sub.c b/support/timespec-sub.c > new file mode 100644 > index 0000000..bf95c7f > --- /dev/null > +++ b/support/timespec-sub.c > @@ -0,0 +1,71 @@ > +/* Subtract two struct timespec values. > + Copyright (C) 2011-2019 Free Software Foundation, Inc. > + This file is part of the GNU C Library and is also part of gnulib. > + Patches to this file should be submitted to both projects. > + > + 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 > + . */ > + > +/* Return the difference between two timespec values A and B. On > + overflow, return an extremal value. This assumes 0 <= tv_nsec < > + TIMESPEC_HZ. */ > + > +#include > +#include "timespec.h" > + > +#include "intprops.h" > + > +struct timespec > +timespec_sub (struct timespec a, struct timespec b) > +{ > + time_t rs = a.tv_sec; > + time_t bs = b.tv_sec; > + int ns = a.tv_nsec - b.tv_nsec; > + int rns = ns; > + time_t tmin = TYPE_MINIMUM (time_t); > + time_t tmax = TYPE_MAXIMUM (time_t); > + > + if (ns < 0) > + { > + rns = ns + TIMESPEC_HZ; > + if (bs < tmax) > + bs++; > + else if (- TYPE_SIGNED (time_t) < rs) > + rs--; > + else > + goto low_overflow; > + } > + > + /* INT_SUBTRACT_WRAPV is not appropriate since time_t might be unsigned. > + In theory time_t might be narrower than int, so plain > + INT_SUBTRACT_OVERFLOW does not suffice. */ > + if (! INT_SUBTRACT_OVERFLOW (rs, bs) && tmin <= rs - bs && rs - bs <= tmax) > + rs -= bs; > + else > + { > + if (rs < 0) > + { > + low_overflow: > + rs = tmin; > + rns = 0; > + } > + else > + { > + rs = tmax; > + rns = TIMESPEC_HZ - 1; > + } > + } > + > + return make_timespec (rs, rns); > +} > diff --git a/support/timespec.c b/support/timespec.c > new file mode 100644 > index 0000000..f1b88c1 > --- /dev/null > +++ b/support/timespec.c > @@ -0,0 +1,58 @@ > +/* Support code for timespec checks. > + 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 > + > +void > +test_timespec_before_impl (const char *file, int line, > + const struct timespec left, > + const struct timespec right) > +{ > + if (left.tv_sec > right.tv_sec > + || (left.tv_sec == right.tv_sec > + && left.tv_nsec > right.tv_nsec)) { > + support_record_failure (); > + const struct timespec diff = timespec_sub (left, right); > + printf ("%s:%d: %ld.%09lds not before %ld.%09lds " > + "(difference %ld.%09lds)n", > + file, line, > + left.tv_sec, left.tv_nsec, > + right.tv_sec, right.tv_nsec, > + diff.tv_sec, diff.tv_nsec); > + } > +} > + > +void > +test_timespec_equal_or_after_impl (const char *file, int line, > + const struct timespec left, > + const struct timespec right) > +{ > + if (left.tv_sec < right.tv_sec > + || (left.tv_sec == right.tv_sec > + && left.tv_nsec < right.tv_nsec)) { > + support_record_failure (); > + const struct timespec diff = timespec_sub (right, left); > + printf ("%s:%d: %ld.%09lds not after %ld.%09lds " > + "(difference %ld.%09lds)n", > + file, line, > + left.tv_sec, left.tv_nsec, > + right.tv_sec, right.tv_nsec, > + diff.tv_sec, diff.tv_nsec); > + } > +} > diff --git a/support/timespec.h b/support/timespec.h > new file mode 100644 > index 0000000..4a8b341 > --- /dev/null > +++ b/support/timespec.h > @@ -0,0 +1,79 @@ > +/* Useful functions for tests that use struct timespec. > + 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 > + . */ > + > +#ifndef SUPPORT_TIMESPEC_H > +#define SUPPORT_TIMESPEC_H > + > +#include > +#include > +#include > +#include > + > +struct timespec timespec_add (struct timespec, struct timespec) > + __attribute__((const)); > +struct timespec timespec_sub (struct timespec, struct timespec) > + __attribute__((const)); > + > +static inline struct timespec > +make_timespec (time_t s, long int ns) > +{ > + struct timespec r; > + r.tv_sec = s; > + r.tv_nsec = ns; > + return r; > +} > + > +enum { TIMESPEC_HZ = 1000000000 }; > + > +void test_timespec_before_impl (const char *file, int line, > + const struct timespec left, > + const struct timespec right); > + > +void test_timespec_equal_or_after_impl (const char *file, int line, > + const struct timespec left, > + const struct timespec right); > + > +/* Check that the timespec on the left represents a time before the > + time on the right. */ > +#define TEST_TIMESPEC_BEFORE(left, right) \ > + test_timespec_before_impl (__FILE__, __LINE__, (left), (right)) > + > +#define TEST_TIMESPEC_BEFORE_NOW(left, clockid) \ > + ({ \ > + struct timespec now; \ > + const int saved_errno = errno; \ > + xclock_gettime ((clockid), &now); \ > + TEST_TIMESPEC_BEFORE ((left), now); \ > + errno = saved_errno; \ > + }) > + > +/* Check that the timespec on the left represents a after before the > + time on the right. */ > +#define TEST_TIMESPEC_EQUAL_OR_AFTER(left, right) \ > + test_timespec_equal_or_after_impl (__FILE__, __LINE__, left, right) > + > +#define TEST_TIMESPEC_NOW_OR_AFTER(clockid, right) \ > + ({ \ > + struct timespec now; \ > + const int saved_errno = errno; \ > + xclock_gettime ((clockid), &now); \ > + TEST_TIMESPEC_EQUAL_OR_AFTER (now, (right)); \ > + errno = saved_errno; \ > + }) > + > +#endif /* SUPPORT_TIMESPEC_H */ >