[3/3] Consolidate Linux epoll_wait syscall

Submitted by Adhemerval Zanella on April 20, 2017, 5:56 p.m.

Details

Message ID 1492710968-7699-3-git-send-email-adhemerval.zanella@linaro.org
State New
Headers show

Commit Message

Adhemerval Zanella April 20, 2017, 5:56 p.m.
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.
---
 ChangeLog                                          | 9 +++++++++
 sysdeps/unix/sysv/linux/Makefile                   | 2 +-
 sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c | 8 ++++++--
 sysdeps/unix/sysv/linux/generic/Makefile           | 2 +-
 sysdeps/unix/sysv/linux/syscalls.list              | 1 -
 5 files changed, 17 insertions(+), 5 deletions(-)
 rename sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c (82%)

Comments

Adhemerval Zanella May 2, 2017, 9:10 p.m.
On 20/04/2017 14:56, Adhemerval Zanella wrote:
> 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.
> ---
>  ChangeLog                                          | 9 +++++++++
>  sysdeps/unix/sysv/linux/Makefile                   | 2 +-
>  sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c | 8 ++++++--
>  sysdeps/unix/sysv/linux/generic/Makefile           | 2 +-
>  sysdeps/unix/sysv/linux/syscalls.list              | 1 -
>  5 files changed, 17 insertions(+), 5 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c (82%)
> 
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 1872cdb..a8790b1 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
> similarity index 82%
> rename from sysdeps/unix/sysv/linux/generic/epoll_wait.c
> rename to sysdeps/unix/sysv/linux/epoll_wait.c
> index d9363f1..eb6e6d3 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 c1daee2..7e27e79 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 4d550b8..1a10903 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
> 

Ping.
Siddhesh Poyarekar May 3, 2017, 3:44 a.m.
On Thursday 20 April 2017 11:26 PM, Adhemerval Zanella wrote:
> 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.

Looks good to me.

Siddhesh

> ---
>  ChangeLog                                          | 9 +++++++++
>  sysdeps/unix/sysv/linux/Makefile                   | 2 +-
>  sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c | 8 ++++++--
>  sysdeps/unix/sysv/linux/generic/Makefile           | 2 +-
>  sysdeps/unix/sysv/linux/syscalls.list              | 1 -
>  5 files changed, 17 insertions(+), 5 deletions(-)
>  rename sysdeps/unix/sysv/linux/{generic => }/epoll_wait.c (82%)
> 
> diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
> index 1872cdb..a8790b1 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
> similarity index 82%
> rename from sysdeps/unix/sysv/linux/generic/epoll_wait.c
> rename to sysdeps/unix/sysv/linux/epoll_wait.c
> index d9363f1..eb6e6d3 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 c1daee2..7e27e79 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 4d550b8..1a10903 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
>

Patch hide | download patch | download mbox

diff --git a/sysdeps/unix/sysv/linux/Makefile b/sysdeps/unix/sysv/linux/Makefile
index 1872cdb..a8790b1 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
similarity index 82%
rename from sysdeps/unix/sysv/linux/generic/epoll_wait.c
rename to sysdeps/unix/sysv/linux/epoll_wait.c
index d9363f1..eb6e6d3 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 c1daee2..7e27e79 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 4d550b8..1a10903 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