qiurui
/
glibc
mirror of git://sourceware.org/git/glibc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

linux: Simplify clock_getres 

With arch-syscall.h it can now assumes the existance of either
__NR_clock_getres or __NR_clock_getres_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).

Reviewed-by: Alistair Francis <alistair.francis@wdc.com>
This commit is contained in:
Adhemerval Zanella 2020-07-09 17:46:34 -03:00
parent 9efac04341
commit ecdcafa571
1 changed files with 15 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
sysdeps/unix/sysv/linux/clock_getres.c
View File

@ -21,6 +21,7 @@
#include <time.h> #include <time.h>
#include <sysdep-vdso.h> #include <sysdep-vdso.h>
#include <time64-support.h>
#include <shlib-compat.h> #include <shlib-compat.h>
#include <kernel-features.h> #include <kernel-features.h>
@ -28,36 +29,26 @@
int int
__clock_getres64 (clockid_t clock_id, struct __timespec64 *res) __clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
{ {
#ifdef __ASSUME_TIME64_SYSCALLS
/* 64 bit ABIs or Newer 32-bit ABIs that only support 64-bit time_t. */
# ifndef __NR_clock_getres_time64
# define __NR_clock_getres_time64 __NR_clock_getres
# endif
# ifdef HAVE_CLOCK_GETRES64_VSYSCALL
return INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
# else
return INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
# endif
#else
int r; int r;
/* Old 32-bit ABI with possible 64-bit time_t support. */
# ifdef __NR_clock_getres_time64 #ifndef __NR_clock_getres_time64
/* Avoid issue a __NR_clock_getres_time64 syscall on kernels that do not # define __NR_clock_getres_time64 __NR_clock_getres
support 64-bit time_t. */ #endif
static int time64_support = 1; if (supports_time64 ())
if (atomic_load_relaxed (&time64_support) != 0)
{ {
# ifdef HAVE_CLOCK_GETRES64_VSYSCALL #ifdef HAVE_CLOCK_GETRES64_VSYSCALL
r = INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res); r = INLINE_VSYSCALL (clock_getres_time64, 2, clock_id, res);
# else #else
r = INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res); r = INLINE_SYSCALL_CALL (clock_getres_time64, clock_id, res);
# 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 ts32; struct timespec ts32;
# ifdef HAVE_CLOCK_GETRES_VSYSCALL # ifdef HAVE_CLOCK_GETRES_VSYSCALL
@ -67,8 +58,9 @@ __clock_getres64 (clockid_t clock_id, struct __timespec64 *res)
# endif # endif
if (r == 0) if (r == 0)
*res = valid_timespec_to_timespec64 (ts32); *res = valid_timespec_to_timespec64 (ts32);
return r;
#endif #endif
return r;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64