mirror of
https://sourceware.org/git/glibc.git
synced 2024-12-27 05:00:15 +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.
73 lines
2.2 KiB
C
73 lines
2.2 KiB
C
/* Copyright (C) 1991-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
|
|
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/>. */
|
|
|
|
#define sigpause __rename_sigpause
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#include <stddef.h> /* For NULL. */
|
|
#undef sigpause
|
|
|
|
#include <sigset-cvt-mask.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
int
|
|
__sigpause (int sig_or_mask, int is_sig)
|
|
{
|
|
sigset_t set;
|
|
|
|
if (is_sig != 0)
|
|
{
|
|
/* The modern X/Open implementation is requested. */
|
|
if (__sigprocmask (0, NULL, &set) < 0
|
|
|| sigdelset (&set, sig_or_mask) < 0)
|
|
return -1;
|
|
}
|
|
else if (sigset_set_old_mask (&set, sig_or_mask) < 0)
|
|
return -1;
|
|
|
|
/* Note the sigpause() is a cancellation point. But since we call
|
|
sigsuspend() which itself is a cancellation point we do not have
|
|
to do anything here. */
|
|
return __sigsuspend (&set);
|
|
}
|
|
libc_hidden_def (__sigpause)
|
|
|
|
/* We have to provide a default version of this function since the
|
|
standards demand it. The version which is a bit more reasonable is
|
|
the BSD version. So make this the default. */
|
|
int
|
|
__attribute__ ((weak))
|
|
__default_sigpause (int mask)
|
|
{
|
|
return __sigpause (mask, 0);
|
|
}
|
|
#undef sigpause
|
|
weak_alias (__default_sigpause, sigpause)
|
|
strong_alias (__default_sigpause, __libc_sigpause)
|
|
|
|
|
|
/* We have to provide a default version of this function since the
|
|
standards demand it. The version which is a bit more reasonable is
|
|
the BSD version. So make this the default. */
|
|
int
|
|
__attribute__ ((weak))
|
|
__xpg_sigpause (int sig)
|
|
{
|
|
return __sigpause (sig, 1);
|
|
}
|
|
strong_alias (__xpg_sigpause, __libc___xpg_sigpause)
|