[1/3] Consolidate Linux poll implementation
Commit Message
This patch consolidates the poll Linux syscall implementation on
sysdeps/unix/sysv/linux/poll.c. It basically removes poll from
auto-generation list and add a default implementation that either
call __NR_poll directly (if the kernel headers defines it) or
ppoll adjusting the timeout argument (as the generic implementation).
Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
* sysdeps/unix/sysv/linux/generic/poll.c: Remove file.
* sysdeps/unix/sysv/linux/poll.c: New file.
* sysdeps/unix/sysv/linux/syscalls.list: Remove poll from
auto-generation list.
---
ChangeLog | 7 +++++++
sysdeps/unix/sysv/linux/{generic => }/poll.c | 8 ++++++--
sysdeps/unix/sysv/linux/syscalls.list | 1 -
3 files changed, 13 insertions(+), 3 deletions(-)
rename sysdeps/unix/sysv/linux/{generic => }/poll.c (88%)
Comments
On 20/04/2017 14:56, Adhemerval Zanella wrote:
> This patch consolidates the poll Linux syscall implementation on
> sysdeps/unix/sysv/linux/poll.c. It basically removes poll from
> auto-generation list and add a default implementation that either
> call __NR_poll directly (if the kernel headers defines it) or
> ppoll adjusting the timeout argument (as the generic implementation).
>
> Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
> aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
>
> * sysdeps/unix/sysv/linux/generic/poll.c: Remove file.
> * sysdeps/unix/sysv/linux/poll.c: New file.
> * sysdeps/unix/sysv/linux/syscalls.list: Remove poll from
> auto-generation list.
> ---
> ChangeLog | 7 +++++++
> sysdeps/unix/sysv/linux/{generic => }/poll.c | 8 ++++++--
> sysdeps/unix/sysv/linux/syscalls.list | 1 -
> 3 files changed, 13 insertions(+), 3 deletions(-)
> rename sysdeps/unix/sysv/linux/{generic => }/poll.c (88%)
>
> diff --git a/sysdeps/unix/sysv/linux/generic/poll.c b/sysdeps/unix/sysv/linux/poll.c
> similarity index 88%
> rename from sysdeps/unix/sysv/linux/generic/poll.c
> rename to sysdeps/unix/sysv/linux/poll.c
> index c06d383..5a781dd 100644
> --- a/sysdeps/unix/sysv/linux/generic/poll.c
> +++ b/sysdeps/unix/sysv/linux/poll.c
> @@ -1,6 +1,6 @@
> -/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
> +/* Linux poll implementation.
> + Copyright (C) 2017 Free Software Foundation, Inc.
> This file is part of the GNU C Library.
> - Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
>
> The GNU C Library is free software; you can redistribute it and/or
> modify it under the terms of the GNU Lesser General Public
> @@ -25,6 +25,9 @@
> int
> __poll (struct pollfd *fds, nfds_t nfds, int timeout)
> {
> +#ifdef __NR_poll
> + return SYSCALL_CANCEL (poll, fds, nfds, timeout);
> +#else
> struct timespec timeout_ts;
> struct timespec *timeout_ts_p = NULL;
>
> @@ -36,6 +39,7 @@ __poll (struct pollfd *fds, nfds_t nfds, int timeout)
> }
>
> return SYSCALL_CANCEL (ppoll, fds, nfds, timeout_ts_p, NULL, 0);
> +#endif
> }
> libc_hidden_def (__poll)
> weak_alias (__poll, poll)
> diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list
> index 5d3c417..fcefefc 100644
> --- a/sysdeps/unix/sysv/linux/syscalls.list
> +++ b/sysdeps/unix/sysv/linux/syscalls.list
> @@ -50,7 +50,6 @@ pause - pause Ci: __libc_pause pause
> pipe - pipe i:f __pipe pipe
> pipe2 - pipe2 i:fi __pipe2 pipe2
> pivot_root EXTRA pivot_root i:ss pivot_root
> -poll - poll Ci:pii __libc_poll __poll poll
> prctl EXTRA prctl i:iiiii __prctl prctl
> putpmsg - putpmsg i:ippii putpmsg
> query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23
>
Ping.
On Thursday 20 April 2017 11:26 PM, Adhemerval Zanella wrote:
> This patch consolidates the poll Linux syscall implementation on
> sysdeps/unix/sysv/linux/poll.c. It basically removes poll from
> auto-generation list and add a default implementation that either
> call __NR_poll directly (if the kernel headers defines it) or
> ppoll adjusting the timeout argument (as the generic implementation).
>
> Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
> aarch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.
>
> * sysdeps/unix/sysv/linux/generic/poll.c: Remove file.
> * sysdeps/unix/sysv/linux/poll.c: New file.
> * sysdeps/unix/sysv/linux/syscalls.list: Remove poll from
> auto-generation list.
OK.
Siddhesh
similarity index 88%
rename from sysdeps/unix/sysv/linux/generic/poll.c
rename to sysdeps/unix/sysv/linux/poll.c
@@ -1,6 +1,6 @@
-/* Copyright (C) 2011-2017 Free Software Foundation, Inc.
+/* Linux poll implementation.
+ Copyright (C) 2017 Free Software Foundation, Inc.
This file is part of the GNU C Library.
- Contributed by Chris Metcalf <cmetcalf@tilera.com>, 2011.
The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -25,6 +25,9 @@
int
__poll (struct pollfd *fds, nfds_t nfds, int timeout)
{
+#ifdef __NR_poll
+ return SYSCALL_CANCEL (poll, fds, nfds, timeout);
+#else
struct timespec timeout_ts;
struct timespec *timeout_ts_p = NULL;
@@ -36,6 +39,7 @@ __poll (struct pollfd *fds, nfds_t nfds, int timeout)
}
return SYSCALL_CANCEL (ppoll, fds, nfds, timeout_ts_p, NULL, 0);
+#endif
}
libc_hidden_def (__poll)
weak_alias (__poll, poll)
@@ -50,7 +50,6 @@ pause - pause Ci: __libc_pause pause
pipe - pipe i:f __pipe pipe
pipe2 - pipe2 i:fi __pipe2 pipe2
pivot_root EXTRA pivot_root i:ss pivot_root
-poll - poll Ci:pii __libc_poll __poll poll
prctl EXTRA prctl i:iiiii __prctl prctl
putpmsg - putpmsg i:ippii putpmsg
query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23