mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-13 00:30:07 +00:00
ce7eb0e903
This patch wraps all uses of *_{enable,disable}_asynccancel and
and *_CANCEL_{ASYNC,RESET} in either already provided macros
(lll_futex_timed_wait_cancel) or creates new ones if the
functionality is not provided (SYSCALL_CANCEL_NCS, lll_futex_wait_cancel,
and lll_futex_timed_wait_cancel).
Also for some generic implementations, the direct call of the macros
are removed since the underlying symbols are suppose to provide
cancellation support.
This is a priliminary patch intended to simplify the work required
for BZ#12683 fix. It is a refactor change, no semantic changes are
expected.
Checked on x86_64-linux-gnu and i686-linux-gnu.
* nptl/pthread_join_common.c (__pthread_timedjoin_ex): Use
lll_wait_tid with timeout.
* nptl/sem_wait.c (__old_sem_wait): Use lll_futex_wait_cancel.
* sysdeps/nptl/aio_misc.h (AIO_MISC_WAIT): Use
futex_reltimed_wait_cancelable for cancelabla mode.
* sysdeps/nptl/gai_misc.h (GAI_MISC_WAIT): Likewise.
* sysdeps/posix/open64.c (__libc_open64): Do not call cancelation
macros.
* sysdeps/posix/sigwait.c (__sigwait): Likewise.
* sysdeps/posix/waitid.c (__sigwait): Likewise.
* sysdeps/unix/sysdep.h (__SYSCALL_CANCEL_CALL,
SYSCALL_CANCEL_NCS): New macro.
* sysdeps/nptl/lowlevellock.h (lll_wait_tid): Add timeout argument.
(lll_timedwait_tid): Remove macro.
* sysdeps/unix/sysv/linux/i386/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/sparc/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/x86_64/lowlevellock.h (lll_wait_tid):
Likewise.
(lll_timedwait_tid): Likewise.
* sysdeps/unix/sysv/linux/clock_nanosleep.c (__clock_nanosleep):
Use INTERNAL_SYSCALL_CANCEL.
* sysdeps/unix/sysv/linux/futex-internal.h
(futex_reltimed_wait_cancelable): Use LIBC_CANCEL_{ASYNC,RESET}
instead of __pthread_{enable,disable}_asynccancel.
* sysdeps/unix/sysv/linux/lowlevellock-futex.h
(lll_futex_wait_cancel): New macro.
101 lines
2.8 KiB
C
101 lines
2.8 KiB
C
/* Implementation of sigwait function from POSIX.1c.
|
|
Copyright (C) 1996-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Ulrich Drepper <drepper@cygnus.com>, 1996.
|
|
|
|
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 <signal.h>
|
|
#include <stddef.h> /* For NULL. */
|
|
#include <sysdep-cancel.h>
|
|
|
|
/* This is our dummy signal handler we use here. */
|
|
static void ignore_signal (int sig);
|
|
|
|
/* Place where to remember which signal we got. Please note that this
|
|
implementation cannot be used for the threaded libc. The
|
|
libpthread must provide an own version. */
|
|
static int was_sig;
|
|
|
|
|
|
static int
|
|
do_sigwait (const sigset_t *set, int *sig)
|
|
{
|
|
sigset_t tmp_mask;
|
|
struct sigaction saved[NSIG];
|
|
struct sigaction action;
|
|
int save_errno;
|
|
int this;
|
|
|
|
/* Prepare set. */
|
|
__sigfillset (&tmp_mask);
|
|
|
|
/* Unblock all signals in the SET and register our nice handler. */
|
|
action.sa_handler = ignore_signal;
|
|
action.sa_flags = 0;
|
|
__sigfillset (&action.sa_mask); /* Block all signals for handler. */
|
|
|
|
/* Make sure we recognize error conditions by setting WAS_SIG to a
|
|
value which does not describe a legal signal number. */
|
|
was_sig = -1;
|
|
|
|
for (this = 1; this < NSIG; ++this)
|
|
if (__sigismember (set, this))
|
|
{
|
|
/* Unblock this signal. */
|
|
__sigdelset (&tmp_mask, this);
|
|
|
|
/* Register temporary action handler. */
|
|
if (__sigaction (this, &action, &saved[this]) != 0)
|
|
goto restore_handler;
|
|
}
|
|
|
|
/* Now we can wait for signals. */
|
|
__sigsuspend (&tmp_mask);
|
|
|
|
restore_handler:
|
|
save_errno = errno;
|
|
|
|
while (--this >= 1)
|
|
if (__sigismember (set, this))
|
|
/* We ignore errors here since we must restore all handlers. */
|
|
__sigaction (this, &saved[this], NULL);
|
|
|
|
__set_errno (save_errno);
|
|
|
|
/* Store the result and return. */
|
|
*sig = was_sig;
|
|
return was_sig == -1 ? -1 : 0;
|
|
}
|
|
|
|
|
|
int
|
|
__sigwait (const sigset_t *set, int *sig)
|
|
{
|
|
/* __sigsuspend should be a cancellation point. */
|
|
return do_sigitid (idtype, id, infop, options);
|
|
}
|
|
libc_hidden_def (__sigwait)
|
|
weak_alias (__sigwait, sigwait)
|
|
|
|
|
|
static void
|
|
ignore_signal (int sig)
|
|
{
|
|
/* Remember the signal. */
|
|
was_sig = sig;
|
|
}
|