lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

linux: Simplify clock_gettime

Browse Source 
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).
This commit is contained in:
Adhemerval Zanella
2020-07-10 09:50:04 -03:00
parent 4f7092348d
commit d9310f33fc
1 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
sysdeps/unix/sysv/linux/clock_gettime.c
View File

@ -22,43 +22,34 @@
#include <time.h> #include <time.h>
#include "kernel-posix-cpu-timers.h" #include "kernel-posix-cpu-timers.h"
#include <sysdep-vdso.h> #include <sysdep-vdso.h>
#include <time64-support.h>
#include <shlib-compat.h> #include <shlib-compat.h>
/* Get current value of CLOCK and store it in TP. */ /* Get current value of CLOCK and store it in TP. */
int int
__clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp) __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; int r;
/* Old 32-bit ABI with possible 64-bit time_t support. */
# ifdef __NR_clock_gettime64 #ifndef __NR_clock_gettime64
/* Avoid issue a __NR_clock_gettime64 syscall on kernels that do not # define __NR_clock_gettime64 __NR_clock_gettime
support 64-bit time_t. */ #endif
static int time64_support = 1;
if (atomic_load_relaxed (&time64_support) != 0) if (supports_time64 ())
{ {
# ifdef HAVE_CLOCK_GETTIME64_VSYSCALL #ifdef HAVE_CLOCK_GETTIME64_VSYSCALL
r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp); r = INLINE_VSYSCALL (clock_gettime64, 2, clock_id, tp);
# else #else
r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp); r = INLINE_SYSCALL_CALL (clock_gettime64, clock_id, tp);
# endif #endif
if (r == 0 || errno != ENOSYS) if (r == 0 || errno != ENOSYS)
return r; return r;
atomic_store_relaxed (&time64_support, 0); mark_time64_unsupported ();
} }
# endif
#ifndef __ASSUME_TIME64_SYSCALLS
/* Fallback code that uses 32-bit support. */ /* Fallback code that uses 32-bit support. */
struct timespec tp32; struct timespec tp32;
# ifdef HAVE_CLOCK_GETTIME_VSYSCALL # ifdef HAVE_CLOCK_GETTIME_VSYSCALL
@ -68,8 +59,9 @@ __clock_gettime64 (clockid_t clock_id, struct __timespec64 *tp)
# endif # endif
if (r == 0) if (r == 0)
*tp = valid_timespec_to_timespec64 (tp32); *tp = valid_timespec_to_timespec64 (tp32);
return r;
#endif #endif
return r;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64