diff options
| author | Ulrich Drepper <drepper@redhat.com> | 2003-06-17 20:46:06 +0000 |
|---|---|---|
| committer | Ulrich Drepper <drepper@redhat.com> | 2003-06-17 20:46:06 +0000 |
| commit | aa3cee213a291e2fd7298579059706622dd16793 (patch) | |
| tree | 03e41fae515f7332a202683818f4d1d98053381a /sysdeps/unix/sysv/linux/sigwaitinfo.c | |
| parent | 047aec8f19cdb702f2a0645643f38a12033c353d (diff) | |
| download | glibc-aa3cee213a291e2fd7298579059706622dd16793.tar.gz glibc-aa3cee213a291e2fd7298579059706622dd16793.tar.xz glibc-aa3cee213a291e2fd7298579059706622dd16793.zip | |
Update.
* sysdeps/unix/sysv/linux/sigtimedwait.c: If SIGCANCEL is defined and part of the incoming set, create a temporary set without this signal. * sysdeps/unix/sysv/linux/sigwait.c: Likewise. * sysdeps/unix/sysv/linux/sigwaitinfo.c: Likewise. returning because seconds==0. Add __builtin_expect.
Diffstat (limited to 'sysdeps/unix/sysv/linux/sigwaitinfo.c')
| -rw-r--r-- | sysdeps/unix/sysv/linux/sigwaitinfo.c | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/sysdeps/unix/sysv/linux/sigwaitinfo.c b/sysdeps/unix/sysv/linux/sigwaitinfo.c index ade5ce9175..56cf0c96bb 100644 --- a/sysdeps/unix/sysv/linux/sigwaitinfo.c +++ b/sysdeps/unix/sysv/linux/sigwaitinfo.c @@ -33,6 +33,18 @@ extern int __syscall_rt_sigtimedwait (const sigset_t *__unbounded, siginfo_t *__ static int do_sigwaitinfo (const sigset_t *set, siginfo_t *info) { +#ifdef SIGCANCEL + sigset_t tmpset; + if (set != NULL && __sigismember (set, SIGCANCEL)) + { + /* Create a temporary mask without the bit for SIGCANCEL set. */ + // We are not copying more than we have to. + memcpy (&tmpset, set, _NSIG / 8); + __sigdelset (&tmpset, SIGCANCEL); + set = &tmpset; + } +#endif + /* XXX The size argument hopefully will have to be changed to the real size of the user-level sigset_t. */ int result = INLINE_SYSCALL (rt_sigtimedwait, 4, CHECK_SIGSET (set), |