From e7608d778994e0236b2fe66ec70bb0c5a0aa0282 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Mon, 21 Apr 2003 07:39:20 +0000 Subject: Update. 2003-04-21 Ulrich Drepper * sysdeps/unix/sysv/linux/sigprocmask.c: Prevent changing mask for SIGCANCEL. * sysdeps/unix/sysv/linux/alpha/bits/siginfo.h: Define SI_TKILL. * sysdeps/unix/sysv/linux/bits/siginfo.h: Define SI_TKILL. * sysdeps/unix/sysv/linux/ia64/bits/siginfo.h: Define SI_TKILL. * sysdeps/unix/sysv/linux/s390/bits/siginfo.h: Define SI_TKILL. * sysdeps/unix/sysv/linux/sparc/bits/siginfo.h: Define SI_TKILL. first syscall parameter to const char*. --- nptl/sysdeps/pthread/pthread_sigmask.c | 35 +++++---------------------- nptl/sysdeps/pthread/sigaction.c | 2 +- nptl/sysdeps/pthread/sigprocmask.c | 20 +++++++++++++++ nptl/sysdeps/unix/sysv/linux/allocrtsig.c | 2 +- nptl/sysdeps/unix/sysv/linux/timer_routines.c | 24 ++++++++++++------ 5 files changed, 45 insertions(+), 38 deletions(-) create mode 100644 nptl/sysdeps/pthread/sigprocmask.c (limited to 'nptl/sysdeps') diff --git a/nptl/sysdeps/pthread/pthread_sigmask.c b/nptl/sysdeps/pthread/pthread_sigmask.c index df6ac64ddb..efe186ac2c 100644 --- a/nptl/sysdeps/pthread/pthread_sigmask.c +++ b/nptl/sysdeps/pthread/pthread_sigmask.c @@ -32,36 +32,13 @@ pthread_sigmask (how, newmask, oldmask) sigset_t local_newmask; /* The only thing we have to make sure here is that SIGCANCEL is not - blocked and that SIGTIMER is not unblocked. */ - if (newmask != NULL) + blocked. */ + if (newmask != NULL + && __builtin_expect (__sigismember (newmask, SIGCANCEL), 0)) { - if (__builtin_expect (__sigismember (newmask, SIGCANCEL), 0)) - { - local_newmask = *newmask; - __sigdelset (&local_newmask, SIGCANCEL); - newmask = &local_newmask; - } - - if (__builtin_expect (__sigismember (newmask, SIGTIMER), 0)) - { - if (how == SIG_UNBLOCK) - { - if (newmask != &local_newmask) - local_newmask = *newmask; - __sigdelset (&local_newmask, SIGTIMER); - newmask = &local_newmask; - } - } - else - { - if (how == SIG_SETMASK) - { - if (newmask != &local_newmask) - local_newmask = *newmask; - __sigaddset (&local_newmask, SIGTIMER); - newmask = &local_newmask; - } - } + local_newmask = *newmask; + __sigdelset (&local_newmask, SIGCANCEL); + newmask = &local_newmask; } #ifdef INTERNAL_SYSCALL diff --git a/nptl/sysdeps/pthread/sigaction.c b/nptl/sysdeps/pthread/sigaction.c index d69abf09ae..392cb65c90 100644 --- a/nptl/sysdeps/pthread/sigaction.c +++ b/nptl/sysdeps/pthread/sigaction.c @@ -36,7 +36,7 @@ __sigaction (sig, act, oact) const struct sigaction *act; struct sigaction *oact; { - if (sig == SIGCANCEL || sig == SIGTIMER) + if (sig == SIGCANCEL) { __set_errno (EINVAL); return -1; diff --git a/nptl/sysdeps/pthread/sigprocmask.c b/nptl/sysdeps/pthread/sigprocmask.c new file mode 100644 index 0000000000..855b433962 --- /dev/null +++ b/nptl/sysdeps/pthread/sigprocmask.c @@ -0,0 +1,20 @@ +/* Copyright (C) 1997,1998,1999,2000,2001,2003 Free Software Foundation, Inc. + This file is part of the GNU C Library. + + The GNU C Library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + The GNU C Library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with the GNU C Library; if not, write to the Free + Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA + 02111-1307 USA. */ + +#include +#include diff --git a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c index 265416999a..51aeb22765 100644 --- a/nptl/sysdeps/unix/sysv/linux/allocrtsig.c +++ b/nptl/sysdeps/unix/sysv/linux/allocrtsig.c @@ -20,7 +20,7 @@ #include -static int current_rtmin = __SIGRTMIN + 2; +static int current_rtmin = __SIGRTMIN + 1; static int current_rtmax = __SIGRTMAX; diff --git a/nptl/sysdeps/unix/sysv/linux/timer_routines.c b/nptl/sysdeps/unix/sysv/linux/timer_routines.c index e9ece9f488..b0d6ef91bf 100644 --- a/nptl/sysdeps/unix/sysv/linux/timer_routines.c +++ b/nptl/sysdeps/unix/sysv/linux/timer_routines.c @@ -49,6 +49,11 @@ timer_helper_thread (void *arg) sigset_t ss; sigemptyset (&ss); sigaddset (&ss, SIGTIMER); + /* SIGTIMER is the same signal as SIGCANCEL and it is therefore + unblocked so far. Block it for this thread, we handle + cancellation explicitly. */ + INTERNAL_SYSCALL_DECL (err); + INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &ss, NULL, _NSIG / 8); /* Endless loop of waiting for signals. The loop is only ended when the thread is canceled. */ @@ -56,14 +61,19 @@ timer_helper_thread (void *arg) { siginfo_t si; - if (sigwaitinfo (&ss, &si) > 0 && si.si_code == SI_TIMER) + if (sigwaitinfo (&ss, &si) > 0) { - - struct timer *tk = (struct timer *) si.si_ptr; - - /* That the signal we are waiting for. */ - pthread_t th; - (void) pthread_create (&th, &tk->attr, timer_sigev_thread, tk); + if (si.si_code == SI_TIMER) + { + struct timer *tk = (struct timer *) si.si_ptr; + + /* That the signal we are waiting for. */ + pthread_t th; + (void) pthread_create (&th, &tk->attr, timer_sigev_thread, tk); + } + else if (si.si_code == SI_TKILL) + /* The thread is canceled. */ + pthread_exit (NULL); } } } -- cgit 1.4.1