diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-18 13:56:05 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-05-03 10:36:01 -0300 |
| commit | b5eede9730eccec155c2374d20d401cd032519fd (patch) | |
| tree | bf36e60fe7fc710a9116fcfe8c1f2d7147e0b403 | |
| parent | 14ea415d042dcb934a021114c872f3ae7dc7a51c (diff) | |
| download | glibc-b5eede9730eccec155c2374d20d401cd032519fd.tar.gz | |
Consolidate Linux poll implementation
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.
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/poll.c (renamed from sysdeps/unix/sysv/linux/generic/poll.c) | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 1 |
3 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2016-04-03 Adhemerval Zanella <adhemerval.zanella@linaro.org> + + * 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. + 2017-05-03 Joseph Myers <joseph@codesourcery.com> * sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h (HWCAP_ASIMDRDM): diff --git a/sysdeps/unix/sysv/linux/generic/poll.c b/sysdeps/unix/sysv/linux/poll.c index c06d383e2c..5a781ddf48 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 5d3c417d51..fcefefcad2 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 |