lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-30 22:43:12 +03:00
Code Activity

Consolidate Linux poll implementation

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella
2016-11-18 13:56:05 -02:00
parent 14ea415d04
commit b5eede9730
3 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -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> 2017-05-03 Joseph Myers <joseph@codesourcery.com>
* sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h (HWCAP_ASIMDRDM): * sysdeps/unix/sysv/linux/aarch64/bits/hwcap.h (HWCAP_ASIMDRDM):

8
sysdeps/unix/sysv/linux/generic/poll.c → sysdeps/unix/sysv/linux/poll.c
View File

@ -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. 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 The GNU C Library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public modify it under the terms of the GNU Lesser General Public
@ -25,6 +25,9 @@
int int
__poll (struct pollfd *fds, nfds_t nfds, int timeout) __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;
struct timespec *timeout_ts_p = NULL; 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); return SYSCALL_CANCEL (ppoll, fds, nfds, timeout_ts_p, NULL, 0);
#endif
} }
libc_hidden_def (__poll) libc_hidden_def (__poll)
weak_alias (__poll, poll) weak_alias (__poll, poll)

1
sysdeps/unix/sysv/linux/syscalls.list
View File

@ -50,7 +50,6 @@ pause - pause Ci: __libc_pause pause
pipe - pipe i:f __pipe pipe pipe - pipe i:f __pipe pipe
pipe2 - pipe2 i:fi __pipe2 pipe2 pipe2 - pipe2 i:fi __pipe2 pipe2
pivot_root EXTRA pivot_root i:ss pivot_root pivot_root EXTRA pivot_root i:ss pivot_root
poll - poll Ci:pii __libc_poll __poll poll
prctl EXTRA prctl i:iiiii __prctl prctl prctl EXTRA prctl i:iiiii __prctl prctl
putpmsg - putpmsg i:ippii putpmsg putpmsg - putpmsg i:ippii putpmsg
query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23 query_module EXTRA query_module i:sipip __compat_query_module query_module@GLIBC_2.0:GLIBC_2.23