niansa-misc/glibc
1
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-03-06 20:58:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Consolidate Linux epoll_wait syscall

Browse source 
This patch consolidates the epoll_wait Linux syscall generation on
sysdeps/unix/sysv/linux/epoll_wait.c.  The implementation tries to
use __NR_epoll_wait if defined, otherwise calls epoll_pwait.

Checked on i686-linux-gnu, x86_64-linux-gnu, x86_64-linux-gnux32,
arch64-linux-gnu, arm-linux-gnueabihf, and powerpc64le-linux-gnu.

	* sysdeps/unix/sysv/linux/epoll_wait.c: New file.
	* sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove file.
	* sysdeps/unix/sysv/linux/syscalls.list: Remove epoll_wait from
	auto-generation list.
This commit is contained in:
Adhemerval Zanella 2016-11-21 17:40:19 -02:00
parent 26f28fd73d
commit b62c381591
5 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
ChangeLog
View file

@ -1,5 +1,14 @@
2016-04-03 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2016-04-03 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* sysdeps/unix/sysv/linux/epoll_wait.c: New file.
* sysdeps/unix/sysv/linux/generic/epoll_wait.c: Remove file.
* sysdeps/unix/sysv/linux/syscalls.list: Remove epoll_wait from
auto-generation list.
* sysdeps/unix/sysv/linux/Makefile (sysdep_routines): Add
epoll_wait.
* sysdeps/unix/sysv/linux/generic/Makefile (sysdep_routines):
Remove epoll_wait.
* sysdeps/unix/sysv/linux/alpha/Makefile (sysdep_routines): Add * sysdeps/unix/sysv/linux/alpha/Makefile (sysdep_routines): Add
osf_select. osf_select.
* sysdeps/unix/sysv/linux/alpha/select.c: New file. * sysdeps/unix/sysv/linux/alpha/select.c: New file.

2
sysdeps/unix/sysv/linux/Makefile
View file

@ -17,7 +17,7 @@ include $(firstword $(wildcard $(sysdirs:=/sysctl.mk)))
sysdep_routines += clone umount umount2 readahead \ sysdep_routines += clone umount umount2 readahead \
setfsuid setfsgid epoll_pwait signalfd \ setfsuid setfsgid epoll_pwait signalfd \
eventfd eventfd_read eventfd_write prlimit \ eventfd eventfd_read eventfd_write prlimit \
personality personality epoll_wait
CFLAGS-gethostid.c = -fexceptions CFLAGS-gethostid.c = -fexceptions
CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))"

8
sysdeps/unix/sysv/linux/generic/epoll_wait.c → sysdeps/unix/sysv/linux/epoll_wait.c
View file

@ -1,6 +1,6 @@
/* Copyright (C) 2011-2017 Free Software Foundation, Inc. /* Linux epoll_wait syscall 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
@ -24,5 +24,9 @@
int int
epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout) epoll_wait (int epfd, struct epoll_event *events, int maxevents, int timeout)
{ {
#ifdef __NR_epoll_wait
return SYSCALL_CANCEL (epoll_wait, epfd, events, maxevents, timeout);
#else
return epoll_pwait (epfd, events, maxevents, timeout, NULL); return epoll_pwait (epfd, events, maxevents, timeout, NULL);
#endif
} }

2
sysdeps/unix/sysv/linux/generic/Makefile
View file

@ -1,3 +1,3 @@
ifeq ($(subdir),misc) ifeq ($(subdir),misc)
sysdep_routines += epoll_create epoll_wait inotify_init sysdep_routines += epoll_create inotify_init
endif endif

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

@ -12,7 +12,6 @@ delete_module EXTRA delete_module 3 delete_module
epoll_create EXTRA epoll_create i:i epoll_create epoll_create EXTRA epoll_create i:i epoll_create
epoll_create1 EXTRA epoll_create1 i:i epoll_create1 epoll_create1 EXTRA epoll_create1 i:i epoll_create1
epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl
epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait
eventfd EXTRA eventfd2 i:ii eventfd eventfd EXTRA eventfd2 i:ii eventfd
execve - execve i:spp __execve execve execve - execve i:spp __execve execve
fdatasync - fdatasync Ci:i fdatasync fdatasync - fdatasync Ci:i fdatasync