From patchwork Tue Mar 24 13:18:21 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 38604 X-Patchwork-Delegate: l.majewski@majess.pl Return-Path: X-Original-To: libc-alpha@sourceware.org Delivered-To: libc-alpha@sourceware.org Received: from mail-out.m-online.net (mail-out.m-online.net [212.18.0.10]) by sourceware.org (Postfix) with ESMTPS id 7425A385E025 for ; Tue, 24 Mar 2020 13:18:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 7425A385E025 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: sourceware.org; spf=none smtp.mailfrom=lukma@denx.de Received: from frontend01.mail.m-online.net (unknown [192.168.8.182]) by mail-out.m-online.net (Postfix) with ESMTP id 48msJp3c8mz1rrW3; Tue, 24 Mar 2020 14:18:50 +0100 (CET) Received: from localhost (dynscan1.mnet-online.de [192.168.6.70]) by mail.m-online.net (Postfix) with ESMTP id 48msJp3K0Tz1r0bv; Tue, 24 Mar 2020 14:18:50 +0100 (CET) X-Virus-Scanned: amavisd-new at mnet-online.de Received: from mail.mnet-online.de ([192.168.8.182]) by localhost (dynscan1.mail.m-online.net [192.168.6.70]) (amavisd-new, port 10024) with ESMTP id E56CAS0XZ15w; Tue, 24 Mar 2020 14:18:49 +0100 (CET) X-Auth-Info: ixPKSWucxRWcfky6muoVqk+I6DT2Aid1Egz8FMxZbRQ= Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.mnet-online.de (Postfix) with ESMTPSA; Tue, 24 Mar 2020 14:18:48 +0100 (CET) From: Lukasz Majewski To: Joseph Myers , Adhemerval Zanella Cc: Alistair Francis , Alistair Francis , GNU C Library , Florian Weimer , Andreas Schwab , Lukasz Majewski Subject: [PATCH 5/5] y2038: Replace __clock_gettime with __clock_gettime64 Date: Tue, 24 Mar 2020 14:18:21 +0100 Message-Id: <20200324131821.22048-6-lukma@denx.de> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200324131821.22048-1-lukma@denx.de> References: <20200324131821.22048-1-lukma@denx.de> MIME-Version: 1.0 X-Spam-Status: No, score=-30.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, KAM_NUMSUBJECT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_NONE, 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: Tue, 24 Mar 2020 13:18:53 -0000 The __clock_gettime internal function is not supporting 64 bit time on architectures with __WORDSIZE == 32 and __TIMESIZE != 64 (like e.g. ARM 32 bit). The __clock_gettime64 shall be used instead in the glibc itself as it supports 64 bit time on those systems. This change does not bring any change to systems with __WORDSIZE == 64 as for them the __clock_gettime64 is aliased to __clock_gettime (in ./include/time.h). The S390 requires special treatment as it has its own definition of utmp.h at sysdeps/unix/sysv/linux/s390/bits/utmp.h As it uses int64_t fields for tv_sec and tv_usec the generic TIMESPEC_TO_TIMEVAL macro must be used. --- benchtests/bench-timing.h | 2 +- include/random-bits.h | 4 ++-- login/logout.c | 8 ++++++-- login/logwtmp.c | 10 +++++++--- nis/nis_call.c | 6 +++--- sysdeps/generic/hp-timing.h | 4 ++-- sysdeps/generic/memusage.h | 4 ++-- sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c | 4 ++-- sysdeps/unix/sysv/linux/clock.c | 7 ++----- 9 files changed, 27 insertions(+), 22 deletions(-) diff --git a/benchtests/bench-timing.h b/benchtests/bench-timing.h index 5b9a8384bb..a0d6f82465 100644 --- a/benchtests/bench-timing.h +++ b/benchtests/bench-timing.h @@ -18,7 +18,7 @@ #undef attribute_hidden #define attribute_hidden -#define __clock_gettime clock_gettime +#define __clock_gettime __clock_gettime64 #include #include diff --git a/include/random-bits.h b/include/random-bits.h index fd3fa01f9b..7561e55ca6 100644 --- a/include/random-bits.h +++ b/include/random-bits.h @@ -30,8 +30,8 @@ static inline uint32_t random_bits (void) { - struct timespec tv; - __clock_gettime (CLOCK_MONOTONIC, &tv); + struct __timespec64 tv; + __clock_gettime64 (CLOCK_MONOTONIC, &tv); /* Shuffle the lower bits to minimize the clock bias. */ uint32_t ret = tv.tv_nsec ^ tv.tv_sec; ret ^= (ret << 24) | (ret >> 8); diff --git a/login/logout.c b/login/logout.c index 7653fe8886..a421d07301 100644 --- a/login/logout.c +++ b/login/logout.c @@ -47,9 +47,13 @@ logout (const char *line) memset (ut->ut_name, '\0', sizeof ut->ut_name); memset (ut->ut_host, '\0', sizeof ut->ut_host); - struct timespec ts; - __clock_gettime (CLOCK_REALTIME, &ts); + struct __timespec64 ts; + __clock_gettime64 (CLOCK_REALTIME, &ts); +#if __WORDSIZE_TIME64_COMPAT32 || defined __s390x__ || defined __s390__ TIMESPEC_TO_TIMEVAL (&ut->ut_tv, &ts); +#else + ut->ut_tv = valid_timespec64_to_timeval (ts); +#endif ut->ut_type = DEAD_PROCESS; if (pututline (ut) != NULL) diff --git a/login/logwtmp.c b/login/logwtmp.c index 90406acc3d..f823e71d59 100644 --- a/login/logwtmp.c +++ b/login/logwtmp.c @@ -21,6 +21,7 @@ #include #include #include +#include void @@ -36,9 +37,12 @@ logwtmp (const char *line, const char *name, const char *host) strncpy (ut.ut_name, name, sizeof ut.ut_name); strncpy (ut.ut_host, host, sizeof ut.ut_host); - struct timespec ts; - __clock_gettime (CLOCK_REALTIME, &ts); + struct __timespec64 ts; + __clock_gettime64 (CLOCK_REALTIME, &ts); +#if __WORDSIZE_TIME64_COMPAT32 || defined __s390x__ || defined __s390__ TIMESPEC_TO_TIMEVAL (&ut.ut_tv, &ts); - +#else + ut.ut_tv = valid_timespec64_to_timeval (ts); +#endif updwtmp (_PATH_WTMP, &ut); } diff --git a/nis/nis_call.c b/nis/nis_call.c index 92c70e97aa..9c6f62a753 100644 --- a/nis/nis_call.c +++ b/nis/nis_call.c @@ -709,7 +709,7 @@ __nisfind_server (const_nis_name name, int search_parent, nis_error status; directory_obj *obj; struct timeval now; - struct timespec ts; + struct __timespec64 ts; unsigned int server_used = ~0; unsigned int current_ep = ~0; @@ -719,8 +719,8 @@ __nisfind_server (const_nis_name name, int search_parent, if (*dir != NULL) return NIS_SUCCESS; - __clock_gettime (CLOCK_REALTIME, &ts); - TIMESPEC_TO_TIMEVAL (&now, &ts); + __clock_gettime64 (CLOCK_REALTIME, &ts); + now = valid_timespec64_to_timeval (ts); if ((flags & NO_CACHE) == 0) *dir = nis_server_cache_search (name, search_parent, &server_used, diff --git a/sysdeps/generic/hp-timing.h b/sysdeps/generic/hp-timing.h index e2d7447212..af9d92f7f7 100644 --- a/sysdeps/generic/hp-timing.h +++ b/sysdeps/generic/hp-timing.h @@ -34,8 +34,8 @@ typedef uint64_t hp_timing_t; vDSO symbol. */ #define HP_TIMING_NOW(var) \ ({ \ - struct timespec tv; \ - __clock_gettime (CLOCK_MONOTONIC, &tv); \ + struct __timespec64 tv; \ + __clock_gettime64 (CLOCK_MONOTONIC, &tv); \ (var) = (tv.tv_nsec + UINT64_C(1000000000) * tv.tv_sec); \ }) diff --git a/sysdeps/generic/memusage.h b/sysdeps/generic/memusage.h index a111864b0b..91e56d24de 100644 --- a/sysdeps/generic/memusage.h +++ b/sysdeps/generic/memusage.h @@ -28,9 +28,9 @@ #ifndef GETTIME # define GETTIME(low,high) \ { \ - struct timespec now; \ + struct __timespec64 now; \ uint64_t usecs; \ - clock_gettime (CLOCK_REALTIME, &now); \ + __clock_gettime64 (CLOCK_REALTIME, &now); \ usecs = (uint64_t)now.tv_nsec / 1000 + (uint64_t)now.tv_sec * 1000000; \ low = usecs & 0xffffffff; \ high = usecs >> 32; \ diff --git a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c index 8cf5d303f9..5075ae0444 100644 --- a/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c +++ b/sysdeps/unix/sysv/linux/alpha/osf_gettimeofday.c @@ -35,8 +35,8 @@ __gettimeofday_tv32 (struct __timeval32 *restrict tv32, void *restrict tz) if (__glibc_unlikely (tz != 0)) memset (tz, 0, sizeof (struct timezone)); - struct timespec ts; - __clock_gettime (CLOCK_REALTIME, &ts); + struct __timespec64 ts; + __clock_gettime64 (CLOCK_REALTIME, &ts); *tv32 = valid_timespec_to_timeval32 (ts); return 0; diff --git a/sysdeps/unix/sysv/linux/clock.c b/sysdeps/unix/sysv/linux/clock.c index 24a8df0cf5..157ae8eb3f 100644 --- a/sysdeps/unix/sysv/linux/clock.c +++ b/sysdeps/unix/sysv/linux/clock.c @@ -23,15 +23,12 @@ clock_t clock (void) { - struct timespec ts; + struct __timespec64 ts; _Static_assert (CLOCKS_PER_SEC == 1000000, "CLOCKS_PER_SEC should be 1000000"); - /* clock_gettime shouldn't fail here since CLOCK_PROCESS_CPUTIME_ID is - supported since 2.6.12. Check the return value anyway in case the kernel - barfs on us for some reason. */ - if (__glibc_unlikely (__clock_gettime (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0)) + if (__glibc_unlikely (__clock_gettime64 (CLOCK_PROCESS_CPUTIME_ID, &ts) != 0)) return (clock_t) -1; return (ts.tv_sec * CLOCKS_PER_SEC