about summary refs log tree commit diff
path: root/sysdeps/unix/sysv/linux/generic
diff options
context:
space:
mode:
authorAdhemerval Zanella <adhemerval.zanella@linaro.org>2016-11-18 14:27:03 -0200
committerAdhemerval Zanella <adhemerval.zanella@linaro.org>2017-05-03 10:36:36 -0300
commit26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51 (patch)
tree5c0ea7ed621b772a65127eda0cedebbe38fcb79a /sysdeps/unix/sysv/linux/generic
parentb5eede9730eccec155c2374d20d401cd032519fd (diff)
downloadglibc-26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51.tar.gz
glibc-26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51.tar.xz
glibc-26f28fd73d20df8847d93f88b6e2a7bd3bd9bf51.zip
Consolidate Linux select implementation
This patch consolidates the select Linux syscall implementation on
sysdeps/unix/sysv/linux/select.c.  The changes are:

  1. Remove select from auto-generation syscalls.list on the architecture
     that uses __NR_select.
  2. Remove generic implementation add a default one that handle all
     current cases (with the expection of alpha)
     The new default implementation will either use __NR_select if
     available of fallback to __NR_pselect6 otherwise.
  3. Add a alpha outlier implementation which requires old compatibility
     symbols.

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/alpha/Makefile (sysdep_routines): Add
	osf_select.
	* sysdeps/unix/sysv/linux/alpha/select.c: New file.
	* sysdeps/unix/sysv/linux/alpha/syscalls.list: Remove select and
	osf_select from auto-generation list.
	* sysdeps/unix/sysv/linux/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/sparc/sparc64/syscalls.list: Likewise.
	* sysdeps/unix/sysv/linux/generic/select.c: Remove file.
	* sysdeps/unix/sysv/linux/select.c: New file.
Diffstat (limited to 'sysdeps/unix/sysv/linux/generic')
-rw-r--r--sysdeps/unix/sysv/linux/generic/select.c62
1 files changed, 0 insertions, 62 deletions
diff --git a/sysdeps/unix/sysv/linux/generic/select.c b/sysdeps/unix/sysv/linux/generic/select.c
deleted file mode 100644
index 7743ea3f3a..0000000000
--- a/sysdeps/unix/sysv/linux/generic/select.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* Copyright (C) 2011-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
-   License as published by the Free Software Foundation; either
-   version 2.1 of the License, or (at your option) any later version.
-
-   The GNU C Library is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-   Lesser General Public License for more details.
-
-   You should have received a copy of the GNU Lesser General Public
-   License along with the GNU C Library.  If not, see
-   <http://www.gnu.org/licenses/>.  */
-
-#include <sys/time.h>
-#include <sys/types.h>
-#include <sys/select.h>
-#include <errno.h>
-#include <sysdep-cancel.h>
-
-/* Check the first NFDS descriptors each in READFDS (if not NULL) for read
-   readiness, in WRITEFDS (if not NULL) for write readiness, and in EXCEPTFDS
-   (if not NULL) for exceptional conditions.  If TIMEOUT is not NULL, time out
-   after waiting the interval specified therein.  Returns the number of ready
-   descriptors, or -1 for errors.  */
-
-int
-__select(int nfds, fd_set *readfds,
-         fd_set *writefds, fd_set *exceptfds,
-         struct timeval *timeout)
-{
-  int result;
-  struct timespec ts, *tsp = NULL;
-
-  if (timeout)
-    {
-      TIMEVAL_TO_TIMESPEC (timeout, &ts);
-      tsp = &ts;
-    }
-
-  result = SYSCALL_CANCEL (pselect6, nfds, readfds, writefds, exceptfds, tsp,
-			   NULL);
-
-  if (timeout)
-    {
-      /* Linux by default will update the timeout after a pselect6 syscall
-         (though the pselect() glibc call suppresses this behavior).
-         Since select() on Linux has the same behavior as the pselect6
-         syscall, we update the timeout here.  */
-      TIMESPEC_TO_TIMEVAL (timeout, &ts);
-    }
-
-  return result;
-}
-libc_hidden_def (__select)
-
-weak_alias (__select, select)
-weak_alias (__select, __libc_select)