mirror/glibc
2
0
Fork 0
mirror of git://sourceware.org/git/glibc.git synced 2025-01-18 12:16:13 +08:00
Code Issues Packages Projects Releases Wiki Activity

Remove __waitpid_nocancel

Browse Source 
It enables and disables cancellation with pthread_setcancelstate
before calling the waitpid.  It simplifies the waitpid implementation
for architectures that do not provide either __NR_waitpid or
__NR_wait4.

Checked on x86_64-linux-gnu.
This commit is contained in:
Adhemerval Zanella 2019-11-13 10:42:05 -03:00
parent 6a265e577e
commit 478f70780f
6 changed files with 11 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libio/iopopen.c
View File

@ -281,7 +281,11 @@ _IO_new_proc_close (FILE *fp)
described in POSIX.2, such implementations are not conforming." */
do
{
wait_pid = __waitpid_nocancel (((_IO_proc_file *) fp)->pid, &wstatus, 0);
int state;
__libc_ptf_call (__pthread_setcancelstate,
(PTHREAD_CANCEL_DISABLE, &state), 0);
wait_pid = __waitpid (((_IO_proc_file *) fp)->pid, &wstatus, 0);
__libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
}
while (wait_pid == -1 && errno == EINTR);
if (wait_pid == -1)

2
sysdeps/generic/not-cancel.h
View File

@ -47,8 +47,6 @@
__write (fd, buf, n)
#define __writev_nocancel_nostatus(fd, iov, n) \
(void) __writev (fd, iov, n)
# define __waitpid_nocancel(pid, stat_loc, options) \
__waitpid (pid, stat_loc, options)
#define __fcntl64_nocancel(fd, cmd, ...) \
__fcntl64 (fd, cmd, __VA_ARGS__)

6
sysdeps/posix/system.c
View File

@ -81,7 +81,11 @@ cancel_handler (void *arg)
__kill_noerrno (args->pid, SIGKILL);
TEMP_FAILURE_RETRY (__waitpid_nocancel (args->pid, NULL, 0));
int state;
__libc_ptf_call (__pthread_setcancelstate,
(PTHREAD_CANCEL_DISABLE, &state), 0);
TEMP_FAILURE_RETRY (__waitpid (args->pid, NULL, 0));
__libc_ptf_call (__pthread_setcancelstate, (state, NULL), 0);
DO_LOCK ();
if (SUB_REF () == 0)

2
sysdeps/unix/sysv/linux/Makefile
View File

@ -216,7 +216,7 @@ sysdep_routines += xstatconv internal_statvfs internal_statvfs64 \
open_nocancel open64_nocancel \
openat_nocancel openat64_nocancel \
read_nocancel pread64_nocancel \
waitpid_nocancel write_nocancel statx_cp
write_nocancel statx_cp
sysdep_headers += bits/fcntl-linux.h

4
sysdeps/unix/sysv/linux/not-cancel.h
View File

@ -69,9 +69,6 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
INTERNAL_SYSCALL_CALL (writev, err, fd, iov, iovcnt);
}
/* Uncancelable waitpid. */
__typeof (waitpid) __waitpid_nocancel;
/* Uncancelable fcntl. */
__typeof (__fcntl) __fcntl64_nocancel;
@ -84,7 +81,6 @@ hidden_proto (__read_nocancel)
hidden_proto (__pread64_nocancel)
hidden_proto (__write_nocancel)
hidden_proto (__close_nocancel)
hidden_proto (__waitpid_nocancel)
hidden_proto (__fcntl64_nocancel)
#endif

34
sysdeps/unix/sysv/linux/waitpid_nocancel.c
View File

@ -1,34 +0,0 @@
/* Linux waitpid syscall implementation -- non-cancellable.
Copyright (C) 2018-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
<https://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_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)