[10/23] linux: Simplify timerfd_settime

Message ID 20200713171025.3661832-10-adhemerval.zanella@linaro.org
State New
Headers show
Series
  • [01/23] linux: Simplify clock_adjtime
Related show

Commit Message

With arch-syscall.h it can now assumes the existance of either
__NR_timer_settime or __NR_time_settime_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/timerfd_settime.c | 23 +++++++++--------------
 1 file changed, 9 insertions(+), 14 deletions(-)

-- 
2.25.1

Comments

Lukasz Majewski July 14, 2020, 8:08 a.m. | #1
On Mon, 13 Jul 2020 14:10:12 -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_settime or __NR_time_settime_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/timerfd_settime.c | 23

> +++++++++-------------- 1 file changed, 9 insertions(+), 14

> deletions(-)

> 

> diff --git a/sysdeps/unix/sysv/linux/timerfd_settime.c

> b/sysdeps/unix/sysv/linux/timerfd_settime.c index

> 164b4e860a..7c55e7e8d6 100644 ---

> a/sysdeps/unix/sysv/linux/timerfd_settime.c +++

> b/sysdeps/unix/sysv/linux/timerfd_settime.c @@ -26,18 +26,13 @@ int

>  __timerfd_settime64 (int fd, int flags, const struct __itimerspec64

> *value, struct __itimerspec64 *ovalue)

>  {

> -#ifdef __ASSUME_TIME64_SYSCALLS

> -# ifndef __NR_timerfd_settime64

> -#  define __NR_timerfd_settime64 __NR_timerfd_settime

> -# endif

> -  return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value,

> ovalue); -#else

> -# ifdef __NR_timerfd_settime64

> +#ifndef __NR_timerfd_settime64

> +# define __NR_timerfd_settime64 __NR_timerfd_settime

> +#endif

>    int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags,

> value, ovalue); +#ifndef __ASSUME_TIME64_SYSCALLS

>    if (ret == 0 || errno != ENOSYS)

>      return ret;

> -# endif

> -  struct itimerspec its32, oits32;

>  

>    if (! in_time_t_range ((value->it_value).tv_sec)

>        || ! in_time_t_range ((value->it_interval).tv_sec))

> @@ -46,19 +41,19 @@ __timerfd_settime64 (int fd, int flags, const

> struct __itimerspec64 *value, return -1;

>      }

>  

> +  struct itimerspec its32, oits32;

>    its32.it_interval = valid_timespec64_to_timespec

> (value->it_interval); its32.it_value = valid_timespec64_to_timespec

> (value->it_value); 

> -  int retval = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,

> -                                    &its32, ovalue ? &oits32 : NULL);

> -  if (retval == 0 && ovalue)

> +  ret = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,

> +			     &its32, ovalue ? &oits32 : NULL);

> +  if (ret == 0 && ovalue != NULL)

>      {

>        ovalue->it_interval = valid_timespec_to_timespec64

> (oits32.it_interval); ovalue->it_value = valid_timespec_to_timespec64

> (oits32.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

Patch

diff --git a/sysdeps/unix/sysv/linux/timerfd_settime.c b/sysdeps/unix/sysv/linux/timerfd_settime.c
index 164b4e860a..7c55e7e8d6 100644
--- a/sysdeps/unix/sysv/linux/timerfd_settime.c
+++ b/sysdeps/unix/sysv/linux/timerfd_settime.c
@@ -26,18 +26,13 @@  int
 __timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value,
                      struct __itimerspec64 *ovalue)
 {
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_timerfd_settime64
-#  define __NR_timerfd_settime64 __NR_timerfd_settime
-# endif
-  return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue);
-#else
-# ifdef __NR_timerfd_settime64
+#ifndef __NR_timerfd_settime64
+# define __NR_timerfd_settime64 __NR_timerfd_settime
+#endif
   int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue);
+#ifndef __ASSUME_TIME64_SYSCALLS
   if (ret == 0 || errno != ENOSYS)
     return ret;
-# endif
-  struct itimerspec its32, oits32;
 
   if (! in_time_t_range ((value->it_value).tv_sec)
       || ! in_time_t_range ((value->it_interval).tv_sec))
@@ -46,19 +41,19 @@  __timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value,
       return -1;
     }
 
+  struct itimerspec its32, oits32;
   its32.it_interval = valid_timespec64_to_timespec (value->it_interval);
   its32.it_value = valid_timespec64_to_timespec (value->it_value);
 
-  int retval = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,
-                                    &its32, ovalue ? &oits32 : NULL);
-  if (retval == 0 && ovalue)
+  ret = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,
+			     &its32, ovalue ? &oits32 : NULL);
+  if (ret == 0 && ovalue != NULL)
     {
       ovalue->it_interval = valid_timespec_to_timespec64 (oits32.it_interval);
       ovalue->it_value = valid_timespec_to_timespec64 (oits32.it_value);
     }
-
-  return retval;
 #endif
+  return ret;
 }
 
 #if __TIMESIZE != 64