public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: Simplify timerfd_settime
@ 2020-08-24 18:34 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-08-24 18:34 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=278498a1c0b63a975bf238e897aaadaa7847d4d8
commit 278498a1c0b63a975bf238e897aaadaa7847d4d8
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri Jul 10 15:11:13 2020 -0300
linux: Simplify timerfd_settime
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).
Reviewed-by: Lukasz Majewski <lukma@denx.de>
Diff:
---
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2020-08-24 18:34 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-24 18:34 [glibc] linux: Simplify timerfd_settime Adhemerval Zanella
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).