[09/23] linux: Simplify timer_gettime
Commit Message
With arch-syscall.h it can now assumes the existance of either
__NR_timer_gettime or __NR_time_gettime_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).
---
sysdeps/unix/sysv/linux/timer_gettime.c | 20 ++++++++------------
1 file changed, 8 insertions(+), 12 deletions(-)
Comments
On Mon, 13 Jul 2020 14:10:11 -0300
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote:
> With arch-syscall.h it can now assumes the existance of either
> __NR_timer_gettime or __NR_time_gettime_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).
> ---
> sysdeps/unix/sysv/linux/timer_gettime.c | 20 ++++++++------------
> 1 file changed, 8 insertions(+), 12 deletions(-)
>
> diff --git a/sysdeps/unix/sysv/linux/timer_gettime.c
> b/sysdeps/unix/sysv/linux/timer_gettime.c index
> 1e07d4845b..5d31c7c864 100644 ---
> a/sysdeps/unix/sysv/linux/timer_gettime.c +++
> b/sysdeps/unix/sysv/linux/timer_gettime.c @@ -28,27 +28,23 @@
> __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value) {
> struct timer *kt = (struct timer *) timerid;
>
> -#ifdef __ASSUME_TIME64_SYSCALLS
> -# ifndef __NR_timer_gettime64
> -# define __NR_timer_gettime64 __NR_timer_gettime
> -# endif
> - return INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value);
> -#else
> -# ifdef __NR_timer_gettime64
> +#ifndef __NR_timer_gettime64
> +# define __NR_timer_gettime64 __NR_timer_gettime
> +#endif
> int ret = INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid,
> value); +#ifndef __ASSUME_TIME64_SYSCALLS
> if (ret == 0 || errno != ENOSYS)
> return ret;
> -# endif
> +
> struct itimerspec its32;
> - int retval = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid,
> &its32);
> - if (retval == 0)
> + ret = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32);
> + if (ret == 0)
> {
> value->it_interval = valid_timespec_to_timespec64
> (its32.it_interval); value->it_value = valid_timespec_to_timespec64
> (its32.it_value); }
> -
> - return retval;
> #endif
> + return ret;
> }
>
> #if __TIMESIZE != 64
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Best regards,
Lukasz Majewski
--
DENX Software Engineering GmbH, Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-59 Fax: (+49)-8142-66989-80 Email: lukma@denx.de
@@ -28,27 +28,23 @@ __timer_gettime64 (timer_t timerid, struct __itimerspec64 *value)
{
struct timer *kt = (struct timer *) timerid;
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_timer_gettime64
-# define __NR_timer_gettime64 __NR_timer_gettime
-# endif
- return INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value);
-#else
-# ifdef __NR_timer_gettime64
+#ifndef __NR_timer_gettime64
+# define __NR_timer_gettime64 __NR_timer_gettime
+#endif
int ret = INLINE_SYSCALL_CALL (timer_gettime64, kt->ktimerid, value);
+#ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS)
return ret;
-# endif
+
struct itimerspec its32;
- int retval = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32);
- if (retval == 0)
+ ret = INLINE_SYSCALL_CALL (timer_gettime, kt->ktimerid, &its32);
+ if (ret == 0)
{
value->it_interval = valid_timespec_to_timespec64 (its32.it_interval);
value->it_value = valid_timespec_to_timespec64 (its32.it_value);
}
-
- return retval;
#endif
+ return ret;
}
#if __TIMESIZE != 64