diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2002-12-15 10:26:23 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2002-12-15 10:26:23 +0000 |
| commit | 6ee8d3345646ab0bea91891362a2bbf15503edec (patch) | |
| tree | 718ea6deebec61e44b09eb25817ee5c14da35f57 /sysdeps/unix/sysv/linux/waitpid.c | |
| parent | 2fb6444dbb9672aea7766b3790a3cb70a73473d3 (diff) | |
| download | glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.gz | |
Update.
2002-12-15 Ulrich Drepper <drepper@redhat.com>
* sysdeps/generic/sysdep-cancel.h: Add dummy definitions for
SINGLE_THREAD_P, LIBC_CANCEL_ASYNC, and LIBC_CANCEL_RESET.
* sysdeps/unix/sysv/linux/open64.c: New file.
* sysdeps/generic/pselect.c: Add support for cancellation handling.
* sysdeps/posix/open64.c: Likewise.
* sysdeps/posix/sigpause.c: Likewise.
* sysdeps/posix/sigwait.c: Likewise.
* sysdeps/posix/system.c: Likewise.
* sysdeps/posix/waitid.c: Likewise.
* sysdeps/unix/sysv/linux/accept.S: Likewise.
* sysdeps/unix/sysv/linux/connect.S: Likewise.
* sysdeps/unix/sysv/linux/llseek.c: Likewise.
* sysdeps/unix/sysv/linux/msgrcv.c: Likewise.
* sysdeps/unix/sysv/linux/msgsnd.c: Likewise.
* sysdeps/unix/sysv/linux/poll.c: Likewise.
* sysdeps/unix/sysv/linux/pread.c: Likewise.
* sysdeps/unix/sysv/linux/pread64.c: Likewise.
* sysdeps/unix/sysv/linux/pwrite.c: Likewise.
* sysdeps/unix/sysv/linux/pwrite64.c: Likewise.
* sysdeps/unix/sysv/linux/readv.c: Likewise.
* sysdeps/unix/sysv/linux/recv.S: Likewise.
* sysdeps/unix/sysv/linux/recvfrom.S: Likewise.
* sysdeps/unix/sysv/linux/recvmsg.S: Likewise.
* sysdeps/unix/sysv/linux/send.S: Likewise.
* sysdeps/unix/sysv/linux/sendmsg.S: Likewise.
* sysdeps/unix/sysv/linux/sendto.S: Likewise.
* sysdeps/unix/sysv/linux/sigsuspend.c: Likewise.
* sysdeps/unix/sysv/linux/sigtimedwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwait.c: Likewise.
* sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise.
* sysdeps/unix/sysv/linux/tcdrain.c: Likewise.
* sysdeps/unix/sysv/linux/wait.c: Likewise.
* sysdeps/unix/sysv/linux/waitpid.c: Likewise.
* sysdeps/unix/sysv/linux/writev.c: Likewise.
* sysdeps/unix/sysv/linux/i386/fcntl.c: Likewise.
* sysdeps/unix/sysv/linux/i386/socket.S: Likewise.
Diffstat (limited to 'sysdeps/unix/sysv/linux/waitpid.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/waitpid.c | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/sysdeps/unix/sysv/linux/waitpid.c b/sysdeps/unix/sysv/linux/waitpid.c index 43a63f6ce5..275fb826b4 100644 --- a/sysdeps/unix/sysv/linux/waitpid.c +++ b/sysdeps/unix/sysv/linux/waitpid.c @@ -16,14 +16,26 @@ Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA. */ -#include <sysdep.h> +#include <errno.h> +#include <sysdep-cancel.h> #include <stdlib.h> #include <sys/wait.h> +#include <nptl/pthreadP.h> +#include <tls.h> __pid_t __libc_waitpid (__pid_t pid, int *stat_loc, int options) { - return __wait4 (pid, stat_loc, options, NULL); + if (SINGLE_THREAD_P) + return INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = INLINE_SYSCALL (wait4, 4, pid, stat_loc, options, NULL); + + LIBC_CANCEL_RESET (oldtype); + + return result; } weak_alias (__libc_waitpid, __waitpid) libc_hidden_weak (__waitpid) |