diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2016-11-21 17:40:19 -0200 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-05-03 10:36:43 -0300 |
| commit | b62c3815912bc679a966134affdedd3f35ae8621 (patch) | |
| tree | 23f63208cd67fce9b9638c865dcebf3f887d6d51 | |
| parent | 26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51 (diff) | |
| download | glibc-b62c3815912bc679a966134affdedd3f35ae8621.tar glibc-b62c3815912bc679a966134affdedd3f35ae8621.tar.gz glibc-b62c3815912bc679a966134affdedd3f35ae8621.tar.bz2 glibc-b62c3815912bc679a966134affdedd3f35ae8621.zip | |
Consolidate Linux epoll_wait syscall
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.
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/epoll_wait.c (renamed from sysdeps/unix/sysv/linux/generic/epoll_wait.c) | 8 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/generic/Makefile | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/syscalls.list | 1 |
5 files changed, 17 insertions, 5 deletions
@@ -1,5 +1,14 @@ 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 osf_select. * sysdeps/unix/sysv/linux/alpha/select.c: New file. diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile index 1872cdb179..a8790b1e51 100644 --- a/sysdeps/unix/sysv/linux/Makefile +++ b/sysdeps/unix/sysv/linux/Makefile @@ -17,7 +17,7 @@ include $(firstword $(wildcard $(sysdirs:=/sysctl.mk))) sysdep_routines += clone umount umount2 readahead \ setfsuid setfsgid epoll_pwait signalfd \ eventfd eventfd_read eventfd_write prlimit \ - personality + personality epoll_wait CFLAGS-gethostid.c = -fexceptions CFLAGS-tst-writev.c += "-DARTIFICIAL_LIMIT=(0x80000000-sysconf(_SC_PAGESIZE))" diff --git a/sysdeps/unix/sysv/linux/generic/epoll_wait.c b/sysdeps/unix/sysv/linux/epoll_wait.c index d9363f1d8d..eb6e6d3ace 100644 --- a/sysdeps/unix/sysv/linux/generic/epoll_wait.c +++ b/sysdeps/unix/sysv/linux/epoll_wait.c @@ -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. - 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 @@ -24,5 +24,9 @@ int 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); +#endif } diff --git a/sysdeps/unix/sysv/linux/generic/Makefile b/sysdeps/unix/sysv/linux/generic/Makefile index c1daee2396..7e27e79772 100644 --- a/sysdeps/unix/sysv/linux/generic/Makefile +++ b/sysdeps/unix/sysv/linux/generic/Makefile @@ -1,3 +1,3 @@ ifeq ($(subdir),misc) -sysdep_routines += epoll_create epoll_wait inotify_init +sysdep_routines += epoll_create inotify_init endif diff --git a/sysdeps/unix/sysv/linux/syscalls.list b/sysdeps/unix/sysv/linux/syscalls.list index 4d550b8804..1a1090311c 100644 --- a/sysdeps/unix/sysv/linux/syscalls.list +++ b/sysdeps/unix/sysv/linux/syscalls.list @@ -12,7 +12,6 @@ delete_module EXTRA delete_module 3 delete_module epoll_create EXTRA epoll_create i:i epoll_create epoll_create1 EXTRA epoll_create1 i:i epoll_create1 epoll_ctl EXTRA epoll_ctl i:iiip epoll_ctl -epoll_wait EXTRA epoll_wait Ci:ipii epoll_wait eventfd EXTRA eventfd2 i:ii eventfd execve - execve i:spp __execve execve fdatasync - fdatasync Ci:i fdatasync |