summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoland McGrath <roland@gnu.org>2004-11-17 21:26:59 +0000
committerRoland McGrath <roland@gnu.org>2004-11-17 21:26:59 +0000
commit0086214c64c761de977e51076522593e3a4e411a (patch)
tree0ccf62a9f14857aad119f9334ceb65b776ed91c9
parent579e2d6ef1e9d77892e84ba1ac90eda86782a9ec (diff)
2004-11-17 Roland McGrath <roland@redhat.com>
* sysdeps/unix/sysv/linux/timer_routines.c (__start_helper_thread): Make sure SIGCANCEL is blocked as well.
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_routines.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
index ae5f1f7b54..23c800f98e 100644
--- a/nptl/sysdeps/unix/sysv/linux/timer_routines.c
+++ b/nptl/sysdeps/unix/sysv/linux/timer_routines.c
@@ -122,10 +122,13 @@ __start_helper_thread (void)
(void) pthread_attr_setstacksize (&attr, PTHREAD_STACK_MIN);
/* Block all signals in the helper thread. To do this thoroughly we
- temporarily have to block all signals here. */
+ temporarily have to block all signals here. The helper can lose
+ wakeups if SIGCANCEL is not blocked throughout, but sigfillset omits
+ it. So, we add it back explicitly here. */
sigset_t ss;
sigset_t oss;
sigfillset (&ss);
+ __sigaddset (&ss, SIGCANCEL);
INTERNAL_SYSCALL_DECL (err);
INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_SETMASK, &ss, &oss, _NSIG / 8);