mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-16 08:00:05 +00:00
17cc27d5b7
With upcoming BZ#12683 fix, syscall cancellation is not more handled
by {libc,pthread,librt}_{enable,disable}_asynccancel symbols. This renders
both LIBC_CANCEL_HANDLED and empty declaration and tst-cancel-wrappers.sh
unrequired. This patch removes both the macro and the nptl test.
Checked on x86_64-linux-gnu.
* io/creat.c (LIBC_CANCEL_HANDLED): Remove macro.
* io/ppoll.c (LIBC_CANCEL_HANDLED): Likewise.
* misc/pselect.c (LIBC_CANCEL_HANDLED): Likewise.
* nptl/pthreadP.h (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/generic/sysdep-cancel.h (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/mach/hurd/sysdep-cancel.h (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/posix/pause.c (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/posix/sigpause.c (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/unix/sysv/linux/creat.c (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/unix/sysv/linux/creat64.c (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/unix/sysv/linux/sigwait.c (LIBC_CANCEL_HANDLED): Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c (LIBC_CANCEL_HANDLED):
Likewise.
* nptl/Makefile [$(run-built-tests) = yes] (tests-special): Remove
tst-cancel-wrappers.sh.
(generated): Remove tst-cancel-wrappers.out.
(tst-cancel-wrappers.out): Remove rule.
* nptl/tst-cancel-wrappers.sh: Remove file.
75 lines
2.2 KiB
C
75 lines
2.2 KiB
C
/* Copyright (C) 2006-2019 Free Software Foundation, Inc.
|
|
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
|
|
License along with the GNU C Library; if not, see
|
|
<http://www.gnu.org/licenses/>. */
|
|
|
|
#include <errno.h>
|
|
#include <limits.h>
|
|
#include <signal.h>
|
|
#include <stddef.h> /* For NULL. */
|
|
#include <sys/poll.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
|
|
int
|
|
ppoll (struct pollfd *fds, nfds_t nfds, const struct timespec *timeout,
|
|
const sigset_t *sigmask)
|
|
{
|
|
int tval = -1;
|
|
|
|
/* poll uses a simple millisecond value. Convert it. */
|
|
if (timeout != NULL)
|
|
{
|
|
if (timeout->tv_sec < 0
|
|
|| timeout->tv_nsec < 0 || timeout->tv_nsec >= 1000000000)
|
|
{
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
if (timeout->tv_sec > INT_MAX / 1000
|
|
|| (timeout->tv_sec == INT_MAX / 1000
|
|
&& ((timeout->tv_nsec + 999999) / 1000000 > INT_MAX % 1000)))
|
|
/* We cannot represent the timeout in an int value. Wait
|
|
forever. */
|
|
tval = -1;
|
|
else
|
|
tval = (timeout->tv_sec * 1000
|
|
+ (timeout->tv_nsec + 999999) / 1000000);
|
|
}
|
|
|
|
/* The setting and restoring of the signal mask and the select call
|
|
should be an atomic operation. This can't be done without kernel
|
|
help. */
|
|
sigset_t savemask;
|
|
if (sigmask != NULL)
|
|
__sigprocmask (SIG_SETMASK, sigmask, &savemask);
|
|
|
|
/* Note the ppoll() is a cancellation point. But since we call
|
|
poll() which itself is a cancellation point we do not have
|
|
to do anything here. */
|
|
int retval = __poll (fds, nfds, tval);
|
|
|
|
if (sigmask != NULL)
|
|
__sigprocmask (SIG_SETMASK, &savemask, NULL);
|
|
|
|
return retval;
|
|
}
|
|
|
|
#ifndef ppoll
|
|
libc_hidden_def (ppoll);
|
|
#endif
|