lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

linux: Simplify timerfd_settime

Browse Source 
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>
This commit is contained in:
Adhemerval Zanella
2020-07-10 15:11:13 -03:00
parent 70746a06c2
commit 278498a1c0
1 changed files with 9 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
sysdeps/unix/sysv/linux/timerfd_settime.c
View File

@ -26,18 +26,13 @@ int
__timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value, __timerfd_settime64 (int fd, int flags, const struct __itimerspec64 *value,
struct __itimerspec64 *ovalue) struct __itimerspec64 *ovalue)
{ {
#ifdef __ASSUME_TIME64_SYSCALLS #ifndef __NR_timerfd_settime64
# ifndef __NR_timerfd_settime64 # define __NR_timerfd_settime64 __NR_timerfd_settime
# define __NR_timerfd_settime64 __NR_timerfd_settime #endif
# endif
return INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue);
#else
# ifdef __NR_timerfd_settime64
int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue); int ret = INLINE_SYSCALL_CALL (timerfd_settime64, fd, flags, value, ovalue);
#ifndef __ASSUME_TIME64_SYSCALLS
if (ret == 0 || errno != ENOSYS) if (ret == 0 || errno != ENOSYS)
return ret; return ret;
# endif
struct itimerspec its32, oits32;
if (! in_time_t_range ((value->it_value).tv_sec) if (! in_time_t_range ((value->it_value).tv_sec)
|| ! in_time_t_range ((value->it_interval).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; return -1;
} }
struct itimerspec its32, oits32;
its32.it_interval = valid_timespec64_to_timespec (value->it_interval); its32.it_interval = valid_timespec64_to_timespec (value->it_interval);
its32.it_value = valid_timespec64_to_timespec (value->it_value); its32.it_value = valid_timespec64_to_timespec (value->it_value);
int retval = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags, ret = INLINE_SYSCALL_CALL (timerfd_settime, fd, flags,
&its32, ovalue ? &oits32 : NULL); &its32, ovalue ? &oits32 : NULL);
if (retval == 0 && ovalue) if (ret == 0 && ovalue != NULL)
{ {
ovalue->it_interval = valid_timespec_to_timespec64 (oits32.it_interval); ovalue->it_interval = valid_timespec_to_timespec64 (oits32.it_interval);
ovalue->it_value = valid_timespec_to_timespec64 (oits32.it_value); ovalue->it_value = valid_timespec_to_timespec64 (oits32.it_value);
} }
return retval;
#endif #endif
return ret;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64