From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1791) id 31DFA386F006; Mon, 24 Aug 2020 18:33:23 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 31DFA386F006 Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Adhemerval Zanella To: glibc-cvs@sourceware.org Subject: [glibc] linux: Simplify clock_gettime X-Act-Checkin: glibc X-Git-Author: Adhemerval Zanella X-Git-Refname: refs/heads/master X-Git-Oldrev: 4f7092348df72decb525f9b24ae10931429f8e08 X-Git-Newrev: d9310f33fcc26d87e5bb50d9311a138455b32602 Message-Id: <20200824183323.31DFA386F006@sourceware.org> Date: Mon, 24 Aug 2020 18:33:23 +0000 (GMT) X-BeenThere: glibc-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Glibc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 24 Aug 2020 18:33:23 -0000 https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=d9310f33fcc26d87e5bb50d9311a138455b32602 commit d9310f33fcc26d87e5bb50d9311a138455b32602 Author: Adhemerval Zanella Date: Fri Jul 10 09:50:04 2020 -0300 linux: Simplify clock_gettime With arch-syscall.h it can now assumes the existance of either __NR_clock_gettime or __NR_clock_gettime_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. It also uses the time64-support functions to simplify it further. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Diff: --- sysdeps/unix/sysv/linux/clock_gettime.c | 42 +++++++++++++-------------------- 1 file changed, 17 insertions(+), 25 deletions(-) diff --git a/sysdeps/unix/sysv/linux/clock_gettime.c b/sysdeps/unix/sysv/linux/clock_gettime.c index bfe3823b68..5a65113a1d 100644 --- a/sysdeps/unix/sysv/linux/clock_gettime.c +++ b/sysdeps/unix/sysv/linux/clock_gettime.c @@ -22,43 +22,34 @@ #include #include "kernel-posix-cpu-timers.h" #include - +#include #include /* Get current value of CLOCK and store it in TP. */ int __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) { -#ifdef __ASSUME_TIME64_SYSCALLS - /* 64 bit ABIs or newer 32-bit ABIs that only support 64-bit time_t. */ -# ifndef __NR_clock_gettime64 -# define __NR_clock_gettime64 __NR_clock_gettime -# endif -# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL - return INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp); -# else - return INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); -# endif -#else int r; - /* Old 32-bit ABI with possible 64-bit time_t support. */ -# ifdef __NR_clock_gettime64 - /* Avoid issue a __NR_clock_gettime64 syscall on kernels that do not - support 64-bit time_t. */ - static int time64_support = 1; - if (atomic_load_relaxed (&time64_support) != 0) + +#ifndef __NR_clock_gettime64 +# define __NR_clock_gettime64 __NR_clock_gettime +#endif + + if (supports_time64 ()) { -# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL +#ifdef HAVE_CLOCK_GETTIME64_VSYSCALL r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp); -# else +#else r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); -# endif +#endif + if (r == 0 || errno != ENOSYS) return r; - atomic_store_relaxed (&time64_support, 0); - } -# endif + mark_time64_unsupported (); + } + +#ifndef __ASSUME_TIME64_SYSCALLS /* Fallback code that uses 32-bit support. */ struct timespec tp32; # ifdef HAVE_CLOCK_GETTIME_VSYSCALL @@ -68,8 +59,9 @@ __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) # endif if (r == 0) *tp = valid_timespec_to_timespec64 (tp32); - return r; #endif + + return r; } #if __TIMESIZE != 64