From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 95AF23894C1C for ; Mon, 14 Jun 2021 14:52:10 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 95AF23894C1C Received: from mail-qk1-f199.google.com (mail-qk1-f199.google.com [209.85.222.199]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-289-35Kns7oUNLmEMSikRhxnAA-1; Mon, 14 Jun 2021 10:52:09 -0400 X-MC-Unique: 35Kns7oUNLmEMSikRhxnAA-1 Received: by mail-qk1-f199.google.com with SMTP id u6-20020ae9c0060000b02903ab0c9eea47so8825503qkk.16 for ; Mon, 14 Jun 2021 07:52:09 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:organization :message-id:date:user-agent:mime-version:in-reply-to :content-language:content-transfer-encoding; bh=k298U2YCa1z3Uj2tHCAn7kVm+FKwaA+Q5XsE2HKHn+g=; b=o4JvhmJV/8XKvvnCG6HlW+onxUGGs/Aeg6U9qoezh+nO1+N67umv7kD2lzd0ySrxnv Zdzk0voeaqnY/pzOUtigy9EvWdExFy2oXRuOZ8W0PBUHR/Gipv6LYsGpXY4CZa17F0fU EkmwOrbHssPcSJVNSNy2/t/DfSktRNg6pDZlEXUZZedVX/6fDlaiVcCKgzrZKyeTyNUY aqSx51oo8PlO5Wu5pU0ydwC/PiF6lX2qrFC8jjAEBRSEQPpWIlWu8rbDTWneQXb/KpUW 9iLURZ5uM0yetRdtSb6AQ0rdhTJtY9bjdJ7LK1Fc5zgJG0H4i+9SloWIPoUkJB9R8xFS AmcA== X-Gm-Message-State: AOAM530tH8mjYee7mjksDYu13fOXnze/sdXJRDSDDXr35KO7zPMP5+ix eCf2W/JRsIVHksHBi1CoKjf4igRbI410RyUtUByb4QxBd3+hqY6M5ujCY8wRwTjCc3SuX8MiQ4f trCcKgHalWUP2ntk+T3zD X-Received: by 2002:ac8:670f:: with SMTP id e15mr16804343qtp.291.1623682328690; Mon, 14 Jun 2021 07:52:08 -0700 (PDT) X-Google-Smtp-Source: ABdhPJxyErgK8HHsJr1htQLCN58HF0jOHjDbejARS4mR7L6qe7kpQSAjl0dZ8pDn7nxLKBKCUNyasQ== X-Received: by 2002:ac8:670f:: with SMTP id e15mr16804313qtp.291.1623682328425; Mon, 14 Jun 2021 07:52:08 -0700 (PDT) Received: from [192.168.1.16] (198-84-214-74.cpe.teksavvy.com. [198.84.214.74]) by smtp.gmail.com with ESMTPSA id k1sm7129967qtu.84.2021.06.14.07.52.07 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 14 Jun 2021 07:52:07 -0700 (PDT) Subject: Re: [PATCH v3 22/24] libsupport: Add 64-bit time_t support for time functions To: Adhemerval Zanella , libc-alpha@sourceware.org References: <20210607203613.282543-1-adhemerval.zanella@linaro.org> <20210607203613.282543-23-adhemerval.zanella@linaro.org> From: Carlos O'Donell Organization: Red Hat Message-ID: Date: Mon, 14 Jun 2021 10:52:06 -0400 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:78.0) Gecko/20100101 Thunderbird/78.10.1 MIME-Version: 1.0 In-Reply-To: <20210607203613.282543-23-adhemerval.zanella@linaro.org> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, NICE_REPLY_A, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: libc-alpha@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libc-alpha mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 14 Jun 2021 14:52:13 -0000 On 6/7/21 4:36 PM, Adhemerval Zanella wrote: > The patch adds redirections for xclock_gettime, xclock_settime, > timespec_add, timespec_sub, test_timespec_before_impl, > test_timespec_equal_or_after_impl, support_timespec_ns, > support_timespec_normalize, and support_timespec_check_in_range when > _TIME_BITS=64 is defined. No regressions on x86_64 and i686 and reviewed resulting ABI for correctness. Reviewed-by: Carlos O'Donell Tested-by: carlos O'Donell OK. All occurrences of "64 bit" in v2 removed and fixed in v3. > Co-authored-by: Lukasz Majewski > Tested-by: Carlos O'Donell > --- > support/Makefile | 6 ++++ > support/timespec-add-time64.c | 27 +++++++++++++++++ > support/timespec-add.c | 2 +- > support/timespec-sub-time64.c | 27 +++++++++++++++++ > support/timespec-sub.c | 2 +- > support/timespec-time64.c | 40 +++++++++++++++++++++++++ > support/timespec.c | 9 +++--- > support/timespec.h | 52 +++++++++++++++++++++++++-------- > support/xclock_gettime_time64.c | 26 +++++++++++++++++ > support/xclock_settime_time64.c | 26 +++++++++++++++++ > support/xtime.h | 7 +++++ > 11 files changed, 205 insertions(+), 19 deletions(-) > create mode 100644 support/timespec-add-time64.c > create mode 100644 support/timespec-sub-time64.c > create mode 100644 support/timespec-time64.c > create mode 100644 support/xclock_gettime_time64.c > create mode 100644 support/xclock_settime_time64.c > > diff --git a/support/Makefile b/support/Makefile > index 0a4b057db5..e27b9b164e 100644 > --- a/support/Makefile > +++ b/support/Makefile > @@ -83,8 +83,11 @@ libsupport-routines = \ > support_test_verify_impl \ > temp_file \ > timespec \ > + timespec-time64 \ > timespec-add \ > + timespec-add-time64 \ > timespec-sub \ > + timespec-sub-time64 \ > write_message \ > xaccept \ > xaccept4 \ > @@ -94,7 +97,9 @@ libsupport-routines = \ > xchdir \ > xchroot \ > xclock_gettime \ > + xclock_gettime_time64 \ > xclock_settime \ > + xclock_settime_time64 \ > xclose \ > xchmod \ > xconnect \ > @@ -216,6 +221,7 @@ CFLAGS-support_paths.c = \ > # in support_timespec_check_in_range and for that computation we use > # -fexcess-precision=standard. > CFLAGS-timespec.c += -fexcess-precision=standard > +CFLAGS-timespec-time64.c += -fexcess-precision=standard > > ifeq (,$(CXX)) > LINKS_DSO_PROGRAM = links-dso-program-c > diff --git a/support/timespec-add-time64.c b/support/timespec-add-time64.c > new file mode 100644 > index 0000000000..a25a3c8d34 > --- /dev/null > +++ b/support/timespec-add-time64.c > @@ -0,0 +1,27 @@ > +/* Add two struct __timespec64 values. 64-bit time support. > + Copyright (C) 2021 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 > + . */ > + > +#include > + > +#if __TIMESIZE != 64 > +# define timespec __timespec64 > +# define time_t __time64_t > +# define timespec_add timespec_add_time64 > +# include "timespec-add.c" > +#endif > diff --git a/support/timespec-add.c b/support/timespec-add.c > index cf8bd91291..8ed3acef6d 100644 > --- a/support/timespec-add.c > +++ b/support/timespec-add.c > @@ -61,5 +61,5 @@ timespec_add (struct timespec a, struct timespec b) > } > } > > - return make_timespec (rs, rns); > + return (struct timespec) { .tv_sec = rs, .tv_nsec = rns }; > } > diff --git a/support/timespec-sub-time64.c b/support/timespec-sub-time64.c > new file mode 100644 > index 0000000000..dcbb79211a > --- /dev/null > +++ b/support/timespec-sub-time64.c > @@ -0,0 +1,27 @@ > +/* Subtract two struct __timespec64 values. 64-bit time support. > + Copyright (C) 2021 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 > + . */ > + > +#include > + > +#if __TIMESIZE != 64 > +# define timespec __timespec64 > +# define time_t __time64_t > +# define timespec_sub timespec_sub_time64 > +# include "timespec-sub.c" > +#endif > diff --git a/support/timespec-sub.c b/support/timespec-sub.c > index 08cc233086..0b8fea042d 100644 > --- a/support/timespec-sub.c > +++ b/support/timespec-sub.c > @@ -61,5 +61,5 @@ timespec_sub (struct timespec a, struct timespec b) > } > } > > - return make_timespec (rs, rns); > + return (struct timespec) { .tv_sec = rs, .tv_nsec = rns }; > } > diff --git a/support/timespec-time64.c b/support/timespec-time64.c > new file mode 100644 > index 0000000000..d780658ec3 > --- /dev/null > +++ b/support/timespec-time64.c > @@ -0,0 +1,40 @@ > +/* Support code for timespec checks. 64-bit time support. > + Copyright (C) 2021 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 > + > +#if __TIMESIZE != 64 > +struct __timespec64 timespec_sub_time64 (struct __timespec64, > + struct __timespec64); > + > +#define test_timespec_before_impl test_timespec_before_impl_time64 > +#define test_timespec_equal_or_after_impl \ > + test_timespec_equal_or_after_impl_time64 > +#define support_timespec_ns support_timespec_ns_time64 > +#define support_timespec_normalize support_timespec_normalize_time64 > +#define support_timespec_check_in_range \ > + support_timespec_check_in_range_time64 > +#define timespec __timespec64 > +#define timespec_sub timespec_sub_time64 > + > +#include "timespec.c" > +#endif > diff --git a/support/timespec.c b/support/timespec.c > index b02afad9d3..fcc54861b1 100644 > --- a/support/timespec.c > +++ b/support/timespec.c > @@ -23,9 +23,8 @@ > #include > > void > -test_timespec_before_impl (const char *file, int line, > - const struct timespec left, > - const struct timespec right) > +test_timespec_before_impl (const char *file, int line, struct timespec left, > + struct timespec right) > { > if (left.tv_sec > right.tv_sec > || (left.tv_sec == right.tv_sec > @@ -43,8 +42,8 @@ test_timespec_before_impl (const char *file, int line, > > void > test_timespec_equal_or_after_impl (const char *file, int line, > - const struct timespec left, > - const struct timespec right) > + struct timespec left, > + struct timespec right) > { > if (left.tv_sec < right.tv_sec > || (left.tv_sec == right.tv_sec > diff --git a/support/timespec.h b/support/timespec.h > index a3eb72aa01..0478aef51f 100644 > --- a/support/timespec.h > +++ b/support/timespec.h > @@ -24,11 +24,6 @@ > #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) > { > @@ -40,21 +35,54 @@ make_timespec (time_t s, long int ns) > > enum { TIMESPEC_HZ = 1000000000 }; > > +#ifndef __USE_TIME_BITS64 > +struct timespec timespec_add (struct timespec, struct timespec) > + __attribute__((const)); > +struct timespec timespec_sub (struct timespec, struct timespec) > + __attribute__((const)); > + > void test_timespec_before_impl (const char *file, int line, > - const struct timespec left, > - const struct timespec right); > + struct timespec left, > + struct timespec right); > > void test_timespec_equal_or_after_impl (const char *file, int line, > - const struct timespec left, > - const struct timespec right); > + struct timespec left, > + struct timespec right); > > time_t support_timespec_ns (struct timespec time); > > struct timespec support_timespec_normalize (struct timespec time); > > -int support_timespec_check_in_range (struct timespec expected, struct timespec observed, > - double lower_bound, double upper_bound); > - > +int support_timespec_check_in_range (struct timespec expected, > + struct timespec observed, > + double lower_bound, double upper_bound); > + > +#else > +struct timespec __REDIRECT (timespec_add, (struct timespec, struct timespec), > + timespec_add_time64); > +struct timespec __REDIRECT (timespec_sub, (struct timespec, struct timespec), > + timespec_sub_time64); > +void __REDIRECT (test_timespec_before_impl, (const char *file, int line, > + struct timespec left, > + struct timespec right), > + test_timespec_before_impl_time64); > +void __REDIRECT (test_timespec_equal_or_after_impl, (const char *f, int line, > + struct timespec left, > + struct timespec right), > + test_timespec_equal_or_after_impl_time64); > + > +time_t __REDIRECT (support_timespec_ns, (struct timespec time), > + support_timespec_ns_time64); > + > +struct timespec __REDIRECT (support_timespec_normalize, (struct timespec time), > + support_timespec_normalize_time64); > + > +int __REDIRECT (support_timespec_check_in_range, (struct timespec expected, > + struct timespec observed, > + double lower_bound, > + double upper_bound), > + support_timespec_check_in_range_time64); > +#endif > > /* Check that the timespec on the left represents a time before the > time on the right. */ > diff --git a/support/xclock_gettime_time64.c b/support/xclock_gettime_time64.c > new file mode 100644 > index 0000000000..d2ed0f026d > --- /dev/null > +++ b/support/xclock_gettime_time64.c > @@ -0,0 +1,26 @@ > +/* clock_settime with error checking. 64-bit time_t support. > + Copyright (C) 2021 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 > + > +#if __TIMESIZE != 64 > +# define xclock_gettime xclock_gettime_time64 > +# define timespec __timespec64 > +# define clock_gettime __clock_gettime64 > +# include "xclock_gettime.c" > +#endif > diff --git a/support/xclock_settime_time64.c b/support/xclock_settime_time64.c > new file mode 100644 > index 0000000000..7f7bead876 > --- /dev/null > +++ b/support/xclock_settime_time64.c > @@ -0,0 +1,26 @@ > +/* clock_settime helper with error checking - 64-bit time_t support. > + Copyright (C) 2021 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 > + > +#if __TIMESIZE != 64 > +# define xclock_settime xclock_settime_time64 > +# define timespec __timespec64 > +# define clock_settime __clock_settime64 > +# include "xclock_settime.c" > +#endif > diff --git a/support/xtime.h b/support/xtime.h > index b4ac3b59e2..25a069d447 100644 > --- a/support/xtime.h > +++ b/support/xtime.h > @@ -30,8 +30,15 @@ __BEGIN_DECLS > /* The following functions call the corresponding libc functions and > terminate the process on error. */ > > +#ifndef __USE_TIME_BITS64 > void xclock_gettime (clockid_t clock, struct timespec *ts); > void xclock_settime (clockid_t clock, const struct timespec *ts); > +#else > +void __REDIRECT (xclock_gettime, (clockid_t clock, struct timespec *ts), > + xclock_gettime_time64); > +void __REDIRECT (xclock_settime, (clockid_t clock, const struct timespec *ts), > + xclock_settime_time64); > +#endif > > /* This helper can often simplify tests by avoiding an explicit > variable declaration or allowing that declaration to be const. */ > -- Cheers, Carlos.