mirror of
git://sourceware.org/git/glibc.git
synced 2024-12-09 04:11:27 +08: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.
159 lines
3.9 KiB
C
159 lines
3.9 KiB
C
/* Pseudo implementation of waitid.
|
|
Copyright (C) 1997-2019 Free Software Foundation, Inc.
|
|
This file is part of the GNU C Library.
|
|
Contributed by Zack Weinberg <zack@rabi.phys.columbia.edu>, 1997.
|
|
|
|
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 <assert.h>
|
|
#include <errno.h>
|
|
#include <signal.h>
|
|
#define __need_NULL
|
|
#include <stddef.h>
|
|
#include <sys/wait.h>
|
|
#include <sys/types.h>
|
|
#include <sysdep-cancel.h>
|
|
|
|
|
|
#ifdef DO_WAITID
|
|
# define OUR_WAITID DO_WAITID
|
|
#elif !defined NO_DO_WAITID
|
|
# define OUR_WAITID do_waitid
|
|
#endif
|
|
|
|
#ifdef OUR_WAITID
|
|
static int
|
|
OUR_WAITID (idtype_t idtype, id_t id, siginfo_t *infop, int options)
|
|
{
|
|
pid_t pid, child;
|
|
int status;
|
|
|
|
switch (idtype)
|
|
{
|
|
case P_PID:
|
|
if(id <= 0)
|
|
goto invalid;
|
|
pid = (pid_t) id;
|
|
break;
|
|
case P_PGID:
|
|
if (id < 0 || id == 1)
|
|
goto invalid;
|
|
pid = (pid_t) -id;
|
|
break;
|
|
case P_ALL:
|
|
pid = -1;
|
|
break;
|
|
default:
|
|
invalid:
|
|
__set_errno (EINVAL);
|
|
return -1;
|
|
}
|
|
|
|
/* Technically we're supposed to return EFAULT if infop is bogus,
|
|
but that would involve mucking with signals, which is
|
|
too much hassle. User will have to deal with SIGSEGV/SIGBUS.
|
|
We just check for a null pointer. */
|
|
|
|
if (infop == NULL)
|
|
{
|
|
__set_errno (EFAULT);
|
|
return -1;
|
|
}
|
|
|
|
/* This emulation using waitpid cannot support the waitid modes in which
|
|
we do not reap the child, or match only stopped and not dead children. */
|
|
if (0
|
|
#ifdef WNOWAIT
|
|
|| (options & WNOWAIT)
|
|
#endif
|
|
#ifdef WEXITED
|
|
|| ((options & (WEXITED|WSTOPPED|WCONTINUED))
|
|
!= (WEXITED | (options & WSTOPPED)))
|
|
#endif
|
|
)
|
|
{
|
|
__set_errno (ENOTSUP);
|
|
return -1;
|
|
}
|
|
|
|
/* Note the waitid() is a cancellation point. But since we call
|
|
waitpid() which itself is a cancellation point we do not have
|
|
to do anything here. */
|
|
child = __waitpid (pid, &status,
|
|
options
|
|
#ifdef WEXITED
|
|
&~ WEXITED
|
|
#endif
|
|
);
|
|
|
|
if (child == -1)
|
|
/* `waitpid' set `errno' for us. */
|
|
return -1;
|
|
|
|
if (child == 0)
|
|
{
|
|
/* The WHOHANG bit in OPTIONS is set and there are children available
|
|
but none has a status for us. The XPG docs do not mention this
|
|
case so we clear the `siginfo_t' struct and return successfully. */
|
|
infop->si_signo = 0;
|
|
infop->si_code = 0;
|
|
return 0;
|
|
}
|
|
|
|
/* Decode the status field and set infop members... */
|
|
infop->si_signo = SIGCHLD;
|
|
infop->si_pid = child;
|
|
infop->si_errno = 0;
|
|
|
|
if (WIFEXITED (status))
|
|
{
|
|
infop->si_code = CLD_EXITED;
|
|
infop->si_status = WEXITSTATUS (status);
|
|
}
|
|
else if (WIFSIGNALED (status))
|
|
{
|
|
infop->si_code = WCOREDUMP (status) ? CLD_DUMPED : CLD_KILLED;
|
|
infop->si_status = WTERMSIG (status);
|
|
}
|
|
else if (WIFSTOPPED (status))
|
|
{
|
|
infop->si_code = CLD_STOPPED;
|
|
infop->si_status = WSTOPSIG (status);
|
|
}
|
|
#ifdef WIFCONTINUED
|
|
else if (WIFCONTINUED (status))
|
|
{
|
|
infop->si_code = CLD_CONTINUED;
|
|
infop->si_status = SIGCONT;
|
|
}
|
|
#endif
|
|
else
|
|
/* Can't happen. */
|
|
assert (! "What?");
|
|
|
|
return 0;
|
|
}
|
|
#endif
|
|
|
|
|
|
int
|
|
__waitid (idtype_t idtype, id_t id, siginfo_t *infop, int options)
|
|
{
|
|
/* __waitpid should be a cancellation point. */
|
|
return do_waitid (idtype, id, infop, options);
|
|
}
|
|
weak_alias (__waitid, waitid)
|
|
strong_alias (__waitid, __libc_waitid)
|