mirror of
https://sourceware.org/git/glibc.git
synced 2024-11-27 15:30:07 +00:00
a8410a5fc9
This patch consolidates all the non cancellable waitpid calls to use the __waitpid_nocancel identifier. For non cancellable targets it will be just a macro to call the default respective symbol while on Linux will be a internal one. Checked on x86_64-linux-gnu, x86_64-linux-gnu-x32, and i686-linux-gnu. * libio/ioopen.c (_IO_waitpid): Replace waitpid_not_cancel with __waitpid_nocancel. * sysdeps/generic/not-cancel.h (waitpid_not_cancel): Remove macro. (__waitpid_nocancel): New macro. * sysdeps/unix/sysv/linux/not-cancel.h (waitpid_not_cancel): Remove macro. (__waitpid_nocancel): Replace macro with a function. * sysdeps/unix/sysv/linux/waitpid.c (__waitpid_nocancel): New function.
46 lines
1.4 KiB
C
46 lines
1.4 KiB
C
/* Copyright (C) 1991-2017 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/>. */
|
|
|
|
#include <errno.h>
|
|
#include <sysdep-cancel.h>
|
|
#include <stdlib.h>
|
|
#include <sys/wait.h>
|
|
#include <not-cancel.h>
|
|
|
|
__pid_t
|
|
__waitpid (__pid_t pid, int *stat_loc, int options)
|
|
{
|
|
#ifdef __NR_waitpid
|
|
return SYSCALL_CANCEL (waitpid, pid, stat_loc, options);
|
|
#else
|
|
return SYSCALL_CANCEL (wait4, pid, stat_loc, options, NULL);
|
|
#endif
|
|
}
|
|
libc_hidden_def (__waitpid)
|
|
weak_alias (__waitpid, waitpid)
|
|
|
|
__pid_t
|
|
__waitpid_nocancel (__pid_t pid, int *stat_loc, int options)
|
|
{
|
|
#ifdef __NR_waitpid
|
|
return INLINE_SYSCALL_CALL (waitpid, pid, stat_loc, options);
|
|
#else
|
|
return INLINE_SYSCALL_CALL (wait4, pid, stat_loc, options, NULL);
|
|
#endif
|
|
}
|
|
libc_hidden_def (__waitpid_nocancel)
|