diff options
| author | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-07-03 15:43:51 -0300 |
|---|---|---|
| committer | Adhemerval Zanella <adhemerval.zanella@linaro.org> | 2017-08-21 15:37:45 -0300 |
| commit | a8410a5fc9305c316633a5a3033f3927b759be35 (patch) | |
| tree | 95e1966f5cb3d8fac5cbca59b33bce38720e4120 | |
| parent | 7369800c04f3c0fb9fb15821feb10a7976425aca (diff) | |
| download | glibc-a8410a5fc9305c316633a5a3033f3927b759be35.tar glibc-a8410a5fc9305c316633a5a3033f3927b759be35.tar.gz glibc-a8410a5fc9305c316633a5a3033f3927b759be35.tar.bz2 glibc-a8410a5fc9305c316633a5a3033f3927b759be35.zip | |
Consolidate non cancellable waitpid call
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.
| -rw-r--r-- | ChangeLog | 10 | ||||
| -rw-r--r-- | libio/iopopen.c | 2 | ||||
| -rw-r--r-- | sysdeps/generic/not-cancel.h | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/not-cancel.h | 7 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/waitpid.c | 12 |
5 files changed, 27 insertions, 6 deletions
@@ -1,5 +1,15 @@ 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 __fcntl_nocancel. * sysdeps/generic/not-cancel.h (fcntl_not_cancel): Remove macro. diff --git a/libio/iopopen.c b/libio/iopopen.c index 0c20cbbfe2..a2ddebb32b 100644 --- a/libio/iopopen.c +++ b/libio/iopopen.c @@ -61,7 +61,7 @@ extern int _IO_dup2 (int fd, int fd2) __THROW; #ifndef _IO_waitpid #ifdef _LIBC -#define _IO_waitpid waitpid_not_cancel +#define _IO_waitpid __waitpid_nocancel #else #define _IO_waitpid waitpid #endif diff --git a/sysdeps/generic/not-cancel.h b/sysdeps/generic/not-cancel.h index cf8455099d..3f924c895d 100644 --- a/sysdeps/generic/not-cancel.h +++ b/sysdeps/generic/not-cancel.h @@ -36,7 +36,7 @@ __write (fd, buf, n) #define __writev_nocancel_nostatus(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) #define pause_not_cancel() \ __pause () diff --git a/sysdeps/unix/sysv/linux/not-cancel.h b/sysdeps/unix/sysv/linux/not-cancel.h index acf5775928..c4a60b8d67 100644 --- a/sysdeps/unix/sysv/linux/not-cancel.h +++ b/sysdeps/unix/sysv/linux/not-cancel.h @@ -25,6 +25,7 @@ #include <errno.h> #include <unistd.h> #include <sys/syscall.h> +#include <sys/wait.h> /* Non cancellable open syscall. */ __typeof (open) __open_nocancel; @@ -72,10 +73,8 @@ __writev_nocancel_nostatus (int fd, const struct iovec *iov, int iovcnt) } /* Uncancelable waitpid. */ -#define __waitpid_nocancel(pid, stat_loc, options) \ - INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL) -#define waitpid_not_cancel(pid, stat_loc, options) \ - __waitpid_nocancel(pid, stat_loc, options) +__typeof (waitpid) __waitpid_nocancel; +libc_hidden_proto (__waitpid_nocancel) /* Uncancelable pause. */ #define pause_not_cancel() \ diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c index 2fed421c90..efc4480b5b 100644 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ b/sysdeps/unix/sysv/linux/waitpid.c @@ -19,6 +19,7 @@ #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) @@ -31,3 +32,14 @@ __waitpid (__pid_t pid, int *stat_loc, int options) } 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) |