diff mbox series

[04/23] linux: Simplify clock_settime

Message ID	20200713171025.3661832-4-adhemerval.zanella@linaro.org
State	Committed
Commit	ff6228d5c6b0fa34ecb51228be57392649ffc88e
Headers	DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 5476A388CC3A To: libc-alpha@sourceware.org Subject: [PATCH 04/23] linux: Simplify clock_settime Date: Mon, 13 Jul 2020 14:10:06 -0300 Message-Id: <20200713171025.3661832-4-adhemerval.zanella@linaro.org> In-Reply-To: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> References: <20200713171025.3661832-1-adhemerval.zanella@linaro.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: list From: Adhemerval Zanella via Libc-alpha <libc-alpha@sourceware.org> Reply-To: Adhemerval Zanella <adhemerval.zanella@linaro.org> Errors-To: libc-alpha-bounces@sourceware.org Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>
Series	[01/23] linux: Simplify clock_adjtime \| [01/23] linux: Simplify clock_adjtime [02/23] linux: Simplify clock_gettime [03/23] linux: Simplify clock_nanosleep [04/23] linux: Simplify clock_settime [05/23] linux: Simplify mq_timedreceive [06/23] linux: Simplify mq_timedsend [07/23] linux: Simplify ppoll [08/23] linux: Simplify sched_rr_get_interval [09/23] linux: Simplify timer_gettime [10/23] linux: Simplify timerfd_settime [11/23] linux: Simplify utimensat [12/23] linux: Add helper function to optimize 64-bit time_t fallback support [13/23] linux: Simplify clock_getres [14/23] linux: Add ppoll time64 optimization [15/23] linux: Add time64 semtimedop support [16/23] linux: Add time64 pselect support [17/23] linux: Add time64 select support [18/23] linux: Add time64 recvmmsg support [19/23] linux: Add time64 sigtimedwait support [20/23] linux: Use 64-bit time_t syscall on clock_getcputclockid [21/23] linux: Consolidate utimes [22/23] linux: Fix time64 support for futimesat [23/23] linux: Add time64 support for nanosleep

Commit Message

Adhemerval Zanella Netto July 13, 2020, 5:10 p.m. UTC

  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(-)

Comments

Lukasz Majewski July 14, 2020, 8:02 a.m. UTC | #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

diff mbox series

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