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 ppoll

Browse Source 
With arch-syscall.h it can now assumes the existance of either
__NR_ppoll or __NR_ppoll_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 13:33:40 -03:00
parent 85077eaa54
commit 3feb53bab0
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
sysdeps/unix/sysv/linux/ppoll.c
View File

@ -37,19 +37,16 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
timeout = &tval; timeout = &tval;
} }
#ifdef __ASSUME_TIME64_SYSCALLS
#ifndef __NR_ppoll_time64 #ifndef __NR_ppoll_time64
# define __NR_ppoll_time64 __NR_ppoll # define __NR_ppoll_time64 __NR_ppoll
#endif #endif
return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
__NSIG_BYTES);
#else
# ifdef __NR_ppoll_time64
int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask, int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
__NSIG_BYTES); __NSIG_BYTES);
#ifndef __ASSUME_TIME64_SYSCALLS
if (ret >= 0 || errno != ENOSYS) if (ret >= 0 || errno != ENOSYS)
return ret; return ret;
# endif
struct timespec ts32; struct timespec ts32;
if (timeout) if (timeout)
{ {
@ -62,9 +59,11 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
ts32 = valid_timespec64_to_timespec (*timeout); ts32 = valid_timespec64_to_timespec (*timeout);
} }
return SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask, ret = SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
__NSIG_BYTES); __NSIG_BYTES);
#endif #endif
return ret;
} }
#if __TIMESIZE != 64 #if __TIMESIZE != 64