2020-01-01 00:14:33 +00:00
|
|
|
/* Copyright (C) 2006-2020 Free Software Foundation, Inc.
|
2006-01-20 07:08:05 +00:00
|
|
|
This file is part of the GNU C Library.
|
|
|
|
Contributed by Ulrich Drepper <drepper@redhat.com>, 2006.
|
|
|
|
|
|
|
|
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
|
2012-02-09 23:18:22 +00:00
|
|
|
License along with the GNU C Library; if not, see
|
Prefer https to http for gnu.org and fsf.org URLs
Also, change sources.redhat.com to sourceware.org.
This patch was automatically generated by running the following shell
script, which uses GNU sed, and which avoids modifying files imported
from upstream:
sed -ri '
s,(http|ftp)(://(.*\.)?(gnu|fsf|sourceware)\.org($|[^.]|\.[^a-z])),https\2,g
s,(http|ftp)(://(.*\.)?)sources\.redhat\.com($|[^.]|\.[^a-z]),https\2sourceware.org\4,g
' \
$(find $(git ls-files) -prune -type f \
! -name '*.po' \
! -name 'ChangeLog*' \
! -path COPYING ! -path COPYING.LIB \
! -path manual/fdl-1.3.texi ! -path manual/lgpl-2.1.texi \
! -path manual/texinfo.tex ! -path scripts/config.guess \
! -path scripts/config.sub ! -path scripts/install-sh \
! -path scripts/mkinstalldirs ! -path scripts/move-if-change \
! -path INSTALL ! -path locale/programs/charmap-kw.h \
! -path po/libc.pot ! -path sysdeps/gnu/errlist.c \
! '(' -name configure \
-execdir test -f configure.ac -o -f configure.in ';' ')' \
! '(' -name preconfigure \
-execdir test -f preconfigure.ac ';' ')' \
-print)
and then by running 'make dist-prepare' to regenerate files built
from the altered files, and then executing the following to cleanup:
chmod a+x sysdeps/unix/sysv/linux/riscv/configure
# Omit irrelevant whitespace and comment-only changes,
# perhaps from a slightly-different Autoconf version.
git checkout -f \
sysdeps/csky/configure \
sysdeps/hppa/configure \
sysdeps/riscv/configure \
sysdeps/unix/sysv/linux/csky/configure
# Omit changes that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/powerpc/powerpc64/ppc-mcount.S: trailing lines
git checkout -f \
sysdeps/powerpc/powerpc64/ppc-mcount.S \
sysdeps/unix/sysv/linux/s390/s390-64/syscall.S
# Omit change that caused a pre-commit check to fail like this:
# remote: *** error: sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S: last line does not end in newline
git checkout -f sysdeps/sparc/sparc64/multiarch/memcpy-ultra3.S
2019-09-07 05:40:42 +00:00
|
|
|
<https://www.gnu.org/licenses/>. */
|
2006-01-20 07:08:05 +00:00
|
|
|
|
2019-11-14 21:18:24 +00:00
|
|
|
#include <sys/select.h>
|
2006-01-20 07:08:05 +00:00
|
|
|
#include <sysdep-cancel.h>
|
2020-07-06 16:27:12 +00:00
|
|
|
#include <time64-support.h>
|
2006-01-20 07:08:05 +00:00
|
|
|
|
|
|
|
int
|
2020-07-06 16:27:12 +00:00
|
|
|
__pselect64 (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
|
|
|
|
const struct __timespec64 *timeout, const sigset_t *sigmask)
|
2006-01-20 07:08:05 +00:00
|
|
|
{
|
|
|
|
/* The Linux kernel can in some situations update the timeout value.
|
|
|
|
We do not want that so use a local variable. */
|
2020-07-06 16:27:12 +00:00
|
|
|
struct __timespec64 tval;
|
2006-01-20 07:08:05 +00:00
|
|
|
if (timeout != NULL)
|
|
|
|
{
|
|
|
|
tval = *timeout;
|
|
|
|
timeout = &tval;
|
|
|
|
}
|
|
|
|
|
|
|
|
/* Note: the system call expects 7 values but on most architectures
|
|
|
|
we can only pass in 6 directly. If there is an architecture with
|
|
|
|
support for more parameters a new version of this file needs to
|
|
|
|
be created. */
|
|
|
|
|
2020-07-06 16:27:12 +00:00
|
|
|
#ifndef __NR_pselect6_time64
|
|
|
|
# define __NR_pselect6_time64 __NR_pselect6
|
|
|
|
#endif
|
|
|
|
int r;
|
|
|
|
if (supports_time64 ())
|
|
|
|
{
|
pselect.c: Pass a pointer to SYSCALL_CANCEL [BZ #26606]
commit a92f4e6299fe0e3cb6f77e79de00817aece501ce
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Jul 6 13:27:12 2020 -0300
linux: Add time64 pselect support
changed pselect.c to
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
timeout,
((__syscall_ulong_t[]){ (uintptr_t) sigmask,
__NSIG_BYTES }));
which doesn't work with x32's ARGIFY and data passed to syscall isn't
initialized with sigmask and __NSIG_BYTES. Change to
__syscall_ulong_t data[2] =
{
(uintptr_t) sigmask, __NSIG_BYTES
};
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
timeout, data);
fixes [BZ #26606].
2020-09-12 02:36:12 +00:00
|
|
|
/* NB: This is required by ARGIFY used in x32 internal_syscallN. */
|
|
|
|
__syscall_ulong_t data[2] =
|
|
|
|
{
|
|
|
|
(uintptr_t) sigmask, __NSIG_BYTES
|
|
|
|
};
|
2020-07-06 16:27:12 +00:00
|
|
|
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
|
pselect.c: Pass a pointer to SYSCALL_CANCEL [BZ #26606]
commit a92f4e6299fe0e3cb6f77e79de00817aece501ce
Author: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Date: Mon Jul 6 13:27:12 2020 -0300
linux: Add time64 pselect support
changed pselect.c to
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
timeout,
((__syscall_ulong_t[]){ (uintptr_t) sigmask,
__NSIG_BYTES }));
which doesn't work with x32's ARGIFY and data passed to syscall isn't
initialized with sigmask and __NSIG_BYTES. Change to
__syscall_ulong_t data[2] =
{
(uintptr_t) sigmask, __NSIG_BYTES
};
r = SYSCALL_CANCEL (pselect6_time64, nfds, readfds, writefds, exceptfds,
timeout, data);
fixes [BZ #26606].
2020-09-12 02:36:12 +00:00
|
|
|
timeout, data);
|
2020-07-06 16:27:12 +00:00
|
|
|
if (r == 0 || errno != ENOSYS)
|
|
|
|
return r;
|
|
|
|
|
|
|
|
mark_time64_unsupported ();
|
|
|
|
}
|
2006-01-20 07:08:05 +00:00
|
|
|
|
2020-07-06 16:27:12 +00:00
|
|
|
#ifndef __ASSUME_TIME64_SYSCALLS
|
|
|
|
r = __pselect32 (nfds, readfds, writefds, exceptfds, timeout, sigmask);
|
|
|
|
#endif
|
|
|
|
return r;
|
2006-01-20 07:08:05 +00:00
|
|
|
}
|
2020-07-06 16:27:12 +00:00
|
|
|
|
|
|
|
#if __TIMESIZE != 64
|
|
|
|
libc_hidden_def (__pselect64)
|
|
|
|
|
|
|
|
int
|
|
|
|
__pselect (int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds,
|
|
|
|
const struct timespec *timeout, const sigset_t *sigmask)
|
|
|
|
{
|
|
|
|
struct __timespec64 ts64, *pts64 = NULL;
|
|
|
|
if (timeout != NULL)
|
|
|
|
{
|
|
|
|
ts64 = valid_timespec_to_timespec64 (*timeout);
|
|
|
|
pts64 = &ts64;
|
|
|
|
}
|
|
|
|
return __pselect64 (nfds, readfds, writefds, exceptfds, pts64, sigmask);
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2019-11-14 21:18:24 +00:00
|
|
|
#ifndef __pselect
|
2006-01-21 08:21:04 +00:00
|
|
|
weak_alias (__pselect, pselect)
|
2006-01-20 07:08:05 +00:00
|
|
|
#endif
|