lib/glibc
1
0
Fork 0
mirror of https://sourceware.org/git/glibc.git synced 2025-07-29 11:41:21 +03:00
Code Activity

Consolidate non cancellable waitpid call

Browse Source 
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.
This commit is contained in:
Adhemerval Zanella
2017-07-03 15:43:51 -03:00
parent 7369800c04
commit a8410a5fc9
5 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ChangeLog
View File

@ -1,5 +1,15 @@
2017-08-21 Adhemerval Zanella <adhemerval.zanella@linaro.org> 2017-08-21 Adhemerval Zanella <adhemerval.zanella@linaro.org>
* 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.
* login/utmp_file.c (timeout_handler): Replace fcntl_not_cancel with * login/utmp_file.c (timeout_handler): Replace fcntl_not_cancel with
__fcntl_nocancel. __fcntl_nocancel.
* sysdeps/generic/not-cancel.h (fcntl_not_cancel): Remove macro. * sysdeps/generic/not-cancel.h (fcntl_not_cancel): Remove macro.

2
libio/iopopen.c
View File

@ -61,7 +61,7 @@ extern int _IO_dup2 (int fd, int fd2) __THROW;
#ifndef _IO_waitpid #ifndef _IO_waitpid
#ifdef _LIBC #ifdef _LIBC
#define _IO_waitpid waitpid_not_cancel #define _IO_waitpid __waitpid_nocancel
#else #else
#define _IO_waitpid waitpid #define _IO_waitpid waitpid
#endif #endif

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

@ -36,7 +36,7 @@
__write (fd, buf, n) __write (fd, buf, n)
#define __writev_nocancel_nostatus(fd, iov, n) \ #define __writev_nocancel_nostatus(fd, iov, n) \
(void) __writev (fd, iov, n) (void) __writev (fd, iov, n)
# define waitpid_not_cancel(pid, stat_loc, options) \ # define __waitpid_nocancel(pid, stat_loc, options) \
__waitpid (pid, stat_loc, options) __waitpid (pid, stat_loc, options)
#define pause_not_cancel() \ #define pause_not_cancel() \
__pause () __pause ()

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

@ -25,6 +25,7 @@
#include <errno.h> #include <errno.h>
#include <unistd.h> #include <unistd.h>
#include <sys/syscall.h> #include <sys/syscall.h>
#include <sys/wait.h>
/* Non cancellable open syscall. */ /* Non cancellable open syscall. */
__typeof (open) __open_nocancel; __typeof (open) __open_nocancel;
@ -72,10 +73,8 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt)
} }
/* Uncancelable waitpid. */ /* Uncancelable waitpid. */
#define __waitpid_nocancel(pid, stat_loc, options) \ __typeof (waitpid) __waitpid_nocancel;
INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) libc_hidden_proto (__waitpid_nocancel)
#define waitpid_not_cancel(pid, stat_loc, options) \
__waitpid_nocancel(pid, stat_loc, options)
/* Uncancelable pause. */ /* Uncancelable pause. */
#define pause_not_cancel() \ #define pause_not_cancel() \

12
sysdeps/unix/sysv/linux/waitpid.c
View File

@ -19,6 +19,7 @@
#include <sysdep-cancel.h> #include <sysdep-cancel.h>
#include <stdlib.h> #include <stdlib.h>
#include <sys/wait.h> #include <sys/wait.h>
#include <not-cancel.h>
__pid_t __pid_t
__waitpid (__pid_t pid, int *stat_loc, int options) __waitpid (__pid_t pid, int *stat_loc, int options)
@ -31,3 +32,14 @@ __waitpid (__pid_t pid, int *stat_loc, int options)
} }
libc_hidden_def (__waitpid) libc_hidden_def (__waitpid)
weak_alias (__waitpid, 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)