From patchwork Fri Mar 5 20:15:08 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adhemerval Zanella Netto X-Patchwork-Id: 42323 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4437B39A5C05; Fri, 5 Mar 2021 20:16:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4437B39A5C05 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1614975379; bh=4UBSAFp6cgdYI14jD0rxghCp3tH3PQuHWegLcKBQmWM=; h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To: From; b=pphktEvEJKc4ZhPbtqAsQw4Dzpp6+wP5e8l6DH47IIo8LGHbXsNWR3y+mgP/tWEjr ceJKz+LlKJ4ScwqRL/D6MLEme0GNBaNzEK3nGdHeHs+aQ3R613M5Q6BifKX5dCm5tz yj1ngqPz+jBACjCl+UDuQkVNbzi7Xa7QmTu3VyHA= X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-qt1-x833.google.com (mail-qt1-x833.google.com [IPv6:2607:f8b0:4864:20::833]) by sourceware.org (Postfix) with ESMTPS id A0A8F399C033 for ; Fri, 5 Mar 2021 20:16:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org A0A8F399C033 Received: by mail-qt1-x833.google.com with SMTP id w1so2787157qto.2 for ; Fri, 05 Mar 2021 12:16:14 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=4UBSAFp6cgdYI14jD0rxghCp3tH3PQuHWegLcKBQmWM=; b=pxqQ7Tky55IRoFJDSwI8VUn7HZDE5tS1huoUMbDOa80nK7IcQdLFuT+F5YjtiMbwXz 7OTwJXu6djw4H+HkFp6QvKjgD0uLsSHy0ZGdQc3wTsQcRukIFmVCMAhh0hPTsrzkM0Y7 Ob5lN1U4+KWB8enxBD9GGFdtUuMZBKuX4zGKllN2fVNlRmIWqV7ZSGZTgOY8+OR9BRXA T0a62kd8Q2pFFzGDogmSVW8rC0z2YD5hFgb98KGlwjs2paU+65r1EdwpH0OtGwR9pHIs nQRInnyb80Ydi8W4oONMDbl2Yftih49iBB0ldhqSPPVA2/oBIoiSA1dIBtaG7kaR0VWU 3Xhw== X-Gm-Message-State: AOAM533YV26EKlmmjgbkkQFq6WeGtL2eFFLePN+Fq8hcb1ae3+iPYgcr XVVt0mVHCSi1W179hDxz8AyGFhgvJLAjhA== X-Google-Smtp-Source: ABdhPJywkw/K7Hnx0M2bvKoMU/eGhL7GqS0D+kcvZVxTDRNNFNL2ywK9YunyPMSvc04r8e6gMHx4ZQ== X-Received: by 2002:ac8:d4f:: with SMTP id r15mr10590011qti.289.1614975373865; Fri, 05 Mar 2021 12:16:13 -0800 (PST) Received: from localhost.localdomain ([177.194.48.209]) by smtp.googlemail.com with ESMTPSA id c5sm2526145qkl.21.2021.03.05.12.16.12 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 05 Mar 2021 12:16:13 -0800 (PST) To: libc-alpha@sourceware.org Subject: [PATCH 42/52] libsupport: Add 64 bit time_t support for time functions Date: Fri, 5 Mar 2021 17:15:08 -0300 Message-Id: <20210305201518.798584-43-adhemerval.zanella@linaro.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20210305201518.798584-1-adhemerval.zanella@linaro.org> References: <20210305201518.798584-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 X-Spam-Status: No, score=-13.4 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_NONE, 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-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha From: Adhemerval Zanella Netto Reply-To: Adhemerval Zanella Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" 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. --- support/Makefile | 5 ++++ 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/xtime.h | 5 ++++ 10 files changed, 176 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 diff --git a/support/Makefile b/support/Makefile index bb9889efb4..846e0dbb26 100644 --- a/support/Makefile +++ b/support/Makefile @@ -79,8 +79,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 \ @@ -90,6 +93,7 @@ libsupport-routines = \ xchdir \ xchroot \ xclock_gettime \ + xclock_gettime_time64 \ xclose \ xchmod \ xconnect \ @@ -209,6 +213,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..8574e1602c --- /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..f88307016d --- /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..5bbf8be7e0 --- /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..bf9fe9bf9c --- /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/xtime.h b/support/xtime.h index 2482837dee..e5fb56a9fc 100644 --- a/support/xtime.h +++ b/support/xtime.h @@ -26,7 +26,12 @@ __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); +#else +void __REDIRECT (xclock_gettime, (clockid_t clock, struct timespec *ts), + xclock_gettime_time64); +#endif /* This helper can often simplify tests by avoiding an explicit variable declaration or allowing that declaration to be const. */