public inbox for glibc-cvs@sourceware.org
help / color / mirror / Atom feed
* [glibc] linux: Simplify ppoll
@ 2020-08-24 18:33 Adhemerval Zanella
0 siblings, 0 replies; only message in thread
From: Adhemerval Zanella @ 2020-08-24 18:33 UTC (permalink / raw)
To: glibc-cvs
https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=3feb53bab07c29f5390420379b3988f71b19e32c
commit 3feb53bab07c29f5390420379b3988f71b19e32c
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Fri Jul 10 13:33:40 2020 -0300
linux: Simplify ppoll
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>
Diff:
---
sysdeps/unix/sysv/linux/ppoll.c | 21 ++++++++++-----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/sysdeps/unix/sysv/linux/ppoll.c b/sysdeps/unix/sysv/linux/ppoll.c
index 0f15636cce..dd2167fc55 100644
--- a/sysdeps/unix/sysv/linux/ppoll.c
+++ b/sysdeps/unix/sysv/linux/ppoll.c
@@ -37,19 +37,16 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
timeout = &tval;
}
-#ifdef __ASSUME_TIME64_SYSCALLS
-# ifndef __NR_ppoll_time64
-# define __NR_ppoll_time64 __NR_ppoll
-# endif
- return SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
- __NSIG_BYTES);
-#else
-# ifdef __NR_ppoll_time64
+#ifndef __NR_ppoll_time64
+# define __NR_ppoll_time64 __NR_ppoll
+#endif
int ret = SYSCALL_CANCEL (ppoll_time64, fds, nfds, timeout, sigmask,
__NSIG_BYTES);
+
+#ifndef __ASSUME_TIME64_SYSCALLS
if (ret >= 0 || errno != ENOSYS)
return ret;
-# endif
+
struct timespec ts32;
if (timeout)
{
@@ -62,9 +59,11 @@ __ppoll64 (struct pollfd *fds, nfds_t nfds, const struct __timespec64 *timeout,
ts32 = valid_timespec64_to_timespec (*timeout);
}
- return SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
- __NSIG_BYTES);
+ ret = SYSCALL_CANCEL (ppoll, fds, nfds, timeout ? &ts32 : NULL, sigmask,
+ __NSIG_BYTES);
#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:33 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:33 [glibc] linux: Simplify ppoll 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).