diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-07-10 09:50:04 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2020-08-24 14:28:21 -0300 |
| commit | d9310f33fcc26d87e5bb50d9311a138455b32602 (patch) | |
| tree | bf1065cd13e6bdb4aea42e0273170b1aaf744685 | |
| parent | 4f7092348df72decb525f9b24ae10931429f8e08 (diff) | |
| download | glibc-d9310f33fcc26d87e5bb50d9311a138455b32602.tar glibc-d9310f33fcc26d87e5bb50d9311a138455b32602.tar.gz glibc-d9310f33fcc26d87e5bb50d9311a138455b32602.tar.bz2 glibc-d9310f33fcc26d87e5bb50d9311a138455b32602.zip | |
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).
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_gettime.c | 42 |
1 files 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 |