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/sigwait.c | |
| parent | 2fb6444dbb9672aea7766b3790a3cb70a73473d3 (diff) | |
| download | glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.zip glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.gz glibc-6ee8d3345646ab0bea91891362a2bbf15503edec.tar.bz2 | |
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/sigwait.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigwait.c | 25 |
1 files changed, 20 insertions, 5 deletions
diff --git a/sysdeps/unix/sysv/linux/sigwait.c b/sysdeps/unix/sysv/linux/sigwait.c index 78e5852..f99c640 100644 --- a/sysdeps/unix/sysv/linux/sigwait.c +++ b/sysdeps/unix/sysv/linux/sigwait.c @@ -21,7 +21,7 @@ #define __need_NULL #include <stddef.h> -#include <sysdep.h> +#include <sysdep-cancel.h> #include <sys/syscall.h> #include <bp-checks.h> @@ -31,10 +31,8 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__ /* Return any pending signal or wait for one for the given time. */ -int -__sigwait (set, sig) - const sigset_t *set; - int *sig; +static int +do_sigwait (const sigset_t *set, int *sig) { int ret; @@ -64,6 +62,23 @@ __sigwait (set, sig) return ret; } + +int +__sigwait (set, sig) + const sigset_t *set; + int *sig; +{ + if (SINGLE_THREAD_P) + return do_sigwait (set, sig); + + int oldtype = LIBC_CANCEL_ASYNC (); + + int result = do_sigwait (set, sig); + + LIBC_CANCEL_RESET (oldtype); + + return result; +} libc_hidden_def (__sigwait) weak_alias (__sigwait, sigwait) #else |