[04/23] linux: Simplify clock_settime

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

Commit Message

Carlos O'Donell via Libc-alpha July 13, 2020, 5:10 p.m.
With arch-syscall.h it can now assumes the existance of either
__NR_clock_settime or __NR_clock_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/clock_settime.c | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

-- 
2.25.1

Comments

Lukasz Majewski July 14, 2020, 8:02 a.m. | #1
On Mon, 13 Jul 2020 14:10:06 -0300
Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> wrote:

> With arch-syscall.h it can now assumes the existance of either

> __NR_clock_settime or __NR_clock_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/clock_settime.c | 18 +++++++++---------

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

> 

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

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

> ebda871f4c..ce0bf622c0 100644 ---

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

> b/sysdeps/unix/sysv/linux/clock_settime.c @@ -32,17 +32,15 @@

> __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)

> return -1; }

>  

> -#ifdef __ASSUME_TIME64_SYSCALLS

> -# ifndef __NR_clock_settime64

> -#  define __NR_clock_settime64 __NR_clock_settime

> -# endif

> -  return INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);

> -#else

> -# ifdef __NR_clock_settime64

> +#ifndef __NR_clock_settime64

> +# define __NR_clock_settime64 __NR_clock_settime

> +#endif

>    int ret = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);

> +

> +#ifndef __ASSUME_TIME64_SYSCALLS

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

>      return ret;

> -# endif

> +

>    if (! in_time_t_range (tp->tv_sec))

>      {

>        __set_errno (EOVERFLOW);

> @@ -50,8 +48,10 @@ __clock_settime64 (clockid_t clock_id, const

> struct __timespec64 *tp) }

>  

>    struct timespec ts32 = valid_timespec64_to_timespec (*tp);

> -  return INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);

> +  ret = INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);

>  #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/clock_settime.c b/sysdeps/unix/sysv/linux/clock_settime.c
index ebda871f4c..ce0bf622c0 100644
--- a/sysdeps/unix/sysv/linux/clock_settime.c
+++ b/sysdeps/unix/sysv/linux/clock_settime.c
@@ -32,17 +32,15 @@  __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
       return -1;
     }
 
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_clock_settime64
-#  define __NR_clock_settime64 __NR_clock_settime
-# endif
-  return INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
-#else
-# ifdef __NR_clock_settime64
+#ifndef __NR_clock_settime64
+# define __NR_clock_settime64 __NR_clock_settime
+#endif
   int ret = INLINE_SYSCALL_CALL (clock_settime64, clock_id, tp);
+
+#ifndef __ASSUME_TIME64_SYSCALLS
   if (ret == 0 || errno != ENOSYS)
     return ret;
-# endif
+
   if (! in_time_t_range (tp->tv_sec))
     {
       __set_errno (EOVERFLOW);
@@ -50,8 +48,10 @@  __clock_settime64 (clockid_t clock_id, const struct __timespec64 *tp)
     }
 
   struct timespec ts32 = valid_timespec64_to_timespec (*tp);
-  return INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);
+  ret = INLINE_SYSCALL_CALL (clock_settime, clock_id, &ts32);
 #endif
+
+  return ret;
 }
 
 #if __TIMESIZE != 64