From fd31691c678ada694f141f08c42feed128d7eebc Mon Sep 17 00:00:00 2001 From: Adhemerval Zanella Date: Fri, 10 Jul 2020 14:04:48 -0300 Subject: [PATCH] linux: Simplify sched_rr_get_interval With arch-syscall.h it can now assumes the existance of either __NR_sched_rr_get_interval or __NR_sched_rr_get_interval_time64. The 32-bit time_t support is now only build for !__ASSUME_TIME64_SYSCALLS. Checked on x86_64-linux-gnu and i686-linux-gnu (on 5.4 and on 4.15 kernel). Reviewed-by: Lukasz Majewski --- sysdeps/unix/sysv/linux/sched_rr_gi.c | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/sysdeps/unix/sysv/linux/sched_rr_gi.c b/sysdeps/unix/sysv/linux/sched_rr_gi.c index 3d7b484..9975621 100644 --- a/sysdeps/unix/sysv/linux/sched_rr_gi.c +++ b/sysdeps/unix/sysv/linux/sched_rr_gi.c @@ -25,24 +25,20 @@ int __sched_rr_get_interval64 (pid_t pid, struct __timespec64 *tp) { -#ifdef __ASSUME_TIME64_SYSCALLS -# ifndef __NR_sched_rr_get_interval_time64 -# define __NR_sched_rr_get_interval_time64 __NR_sched_rr_get_interval -# endif - return INLINE_SYSCALL_CALL (sched_rr_get_interval_time64, pid, tp); -#else -# ifdef __NR_sched_rr_get_interval_time64 +#ifndef __NR_sched_rr_get_interval_time64 +# define __NR_sched_rr_get_interval_time64 __NR_sched_rr_get_interval +#endif int ret = INLINE_SYSCALL_CALL (sched_rr_get_interval_time64, pid, tp); +#ifndef __ASSUME_TIME64_SYSCALLS if (ret == 0 || errno != ENOSYS) return ret; -# endif + struct timespec tp32; - int retval = INLINE_SYSCALL_CALL (sched_rr_get_interval, pid, &tp32); - if (retval == 0) + ret = INLINE_SYSCALL_CALL (sched_rr_get_interval, pid, &tp32); + if (ret == 0) *tp = valid_timespec_to_timespec64 (tp32); - - return retval; #endif + return ret; } #if __TIMESIZE != 64 -- 2.7.4