diff options
| -rw-r--r-- | include/time.h | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/clock_getres.c | 38 |
2 files changed, 43 insertions, 3 deletions
diff --git a/include/time.h b/include/time.h index 1f6507ef5f..de660f7f57 100644 --- a/include/time.h +++ b/include/time.h @@ -133,6 +133,14 @@ extern int __clock_settime64 (clockid_t clock_id, libc_hidden_proto (__clock_settime64) #endif +#if __TIMESIZE == 64 +# define __clock_getres64 __clock_getres +#else +extern int __clock_getres64 (clockid_t clock_id, + struct __timespec64 *tp); +libc_hidden_proto (__clock_getres64); +#endif + /* Compute the `struct tm' representation of T, offset OFFSET seconds east of UTC, and store year, yday, mon, mday, wday, hour, min, sec into *TP. diff --git a/sysdeps/unix/sysv/linux/clock_getres.c b/sysdeps/unix/sysv/linux/clock_getres.c index 0b82759043..9497f78787 100644 --- a/sysdeps/unix/sysv/linux/clock_getres.c +++ b/sysdeps/unix/sysv/linux/clock_getres.c @@ -19,21 +19,53 @@ #include <sysdep.h> #include <errno.h> #include <time.h> -#include "kernel-posix-cpu-timers.h" #ifdef HAVE_CLOCK_GETRES_VSYSCALL # define HAVE_VSYSCALL #endif #include <sysdep-vdso.h> - #include <shlib-compat.h> +#include <kernel-features.h> /* Get resolution of clock. */ int -__clock_getres (clockid_t clock_id, struct timespec *res) +__clock_getres64 (clockid_t clock_id, struct __timespec64 *res) { +#ifdef __ASSUME_TIME64_SYSCALLS +# ifndef __NR_clock_getres_time64 return INLINE_VSYSCALL (clock_getres, 2, clock_id, res); +# else + return INLINE_SYSCALL (clock_getres_time64, 2, clock_id, res); +# endif +#else +# ifdef __NR_clock_getres_time64 + int ret = INLINE_SYSCALL (clock_getres_time64, 2, clock_id, res); + if (ret == 0 || errno != ENOSYS) + return ret; +# endif + struct timespec ts32; + int retval = INLINE_VSYSCALL (clock_getres, 2, clock_id, &ts32); + if (! retval && res) + *res = valid_timespec_to_timespec64 (ts32); + + return retval; +#endif +} + +#if __TIMESIZE != 64 +int +__clock_getres (clockid_t clock_id, struct timespec *res) +{ + struct __timespec64 ts64; + int retval; + + retval = __clock_getres64 (clock_id, &ts64); + if (! retval && res) + *res = valid_timespec64_to_timespec (ts64); + + return retval; } +#endif versioned_symbol (libc, __clock_getres, clock_getres, GLIBC_2_17); /* clock_getres moved to libc in version 2.17; |