public inbox for glibc-cvs@sourceware.org help / color / mirror / Atom feed
From: Adhemerval Zanella <azanella@sourceware.org> To: glibc-cvs@sourceware.org Subject: [glibc/azanella/y2038] linux: Simplify clock_gettime Date: Thu, 30 Jul 2020 13:24:36 +0000 (GMT) [thread overview] Message-ID: <20200730132436.5F9A2382EBF2@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=a702f75ac03ca5218ac2a7af37660c3084b255f2 commit a702f75ac03ca5218ac2a7af37660c3084b255f2 Author: Adhemerval Zanella <adhemerval.zanella@linaro.org> 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 <time.h> #include "kernel-posix-cpu-timers.h" #include <sysdep-vdso.h> - +#include <time64-support.h> #include <shlib-compat.h> /* 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
reply other threads:[~2020-07-30 13:24 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200730132436.5F9A2382EBF2@sourceware.org \ --to=azanella@sourceware.org \ --cc=glibc-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).