summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ChangeLog12
-rw-r--r--nptl/ChangeLog13
-rw-r--r--nptl/init.c10
-rw-r--r--nptl/pthreadP.h6
-rw-r--r--nptl/sysdeps/pthread/pthread_sigmask.c35
-rw-r--r--nptl/sysdeps/pthread/sigaction.c2
-rw-r--r--nptl/sysdeps/pthread/sigprocmask.c20
-rw-r--r--nptl/sysdeps/unix/sysv/linux/allocrtsig.c2
-rw-r--r--nptl/sysdeps/unix/sysv/linux/timer_routines.c24
-rw-r--r--sysdeps/unix/sysv/linux/alpha/bits/siginfo.h4
-rw-r--r--sysdeps/unix/sysv/linux/bits/siginfo.h4
-rw-r--r--sysdeps/unix/sysv/linux/ia64/bits/siginfo.h4
-rw-r--r--sysdeps/unix/sysv/linux/s390/bits/siginfo.h4
-rw-r--r--sysdeps/unix/sysv/linux/sigprocmask.c15
-rw-r--r--sysdeps/unix/sysv/linux/sparc/bits/siginfo.h4
15 files changed, 102 insertions, 57 deletions
diff --git a/ChangeLog b/ChangeLog
index 5c6557ff9a..be3a26c909 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,7 +1,17 @@
+2003-04-21 Ulrich Drepper <drepper@redhat.com>
+
+ * 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.
+
2003-04-20 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/not-cancel.h (open_not_cancel): Cast
- first syscall parameter to cnst char*.
+ first syscall parameter to const char*.
2003-04-19 Ulrich Drepper <drepper@redhat.com>
diff --git a/nptl/ChangeLog b/nptl/ChangeLog
index e5302642b8..88af72f057 100644
--- a/nptl/ChangeLog
+++ b/nptl/ChangeLog
@@ -1,3 +1,16 @@
+2003-04-21 Ulrich Drepper <drepper@redhat.com>
+
+ * init.c (__pthread_initialize_minimal): Don't block SIGTIMER.
+ * pthreadP.h: Make SIGTIMER and SIGCANCEL the same.
+ * sysdeps/pthread/pthread_sigmask.c: Remove handling of SIGTIMER.
+ * sysdeps/pthread/sigaction.c: Likewise.
+ * sysdeps/pthread/sigprocmask.c: New file.
+ * sysdeps/unix/sysv/linux/allocrtsig.c (current_rtmin): Define as
+ __SIGRTMIN+1.
+ * sysdeps/unix/sysv/linux/timer_routines.c (timer_helper_thread):
+ Block SIGTIMER. Also handle SI_TKILL events and terminate thread
+ in this case.
+
2003-04-19 Ulrich Drepper <drepper@redhat.com>
* sysdeps/unix/sysv/linux/i386/dl-sysdep.h
diff --git a/nptl/init.c b/nptl/init.c
index 9db50036c6..3e041edeb3 100644
--- a/nptl/init.c
+++ b/nptl/init.c
@@ -223,16 +223,6 @@ __pthread_initialize_minimal_internal (void)
NULL, _NSIG / 8);
- /* The kernel supported POSIX timer handling needs a signal to implement
- SIGEV_THREAD. We block the signal everywhere but we have to make
- sure it is not ignored. The signal is a realtime signal so using
- the default handler is fine (this handler is already selected). */
- __sigdelset (&sa.sa_mask, SIGCANCEL);
- __sigaddset (&sa.sa_mask, SIGTIMER);
- (void) INTERNAL_SYSCALL (rt_sigprocmask, err, 4, SIG_BLOCK, &sa.sa_mask,
- NULL, _NSIG / 8);
-
-
/* Determine the default allowed stack size. This is the size used
in case the user does not specify one. */
struct rlimit limit;
diff --git a/nptl/pthreadP.h b/nptl/pthreadP.h
index ad62be8d21..71f1a7fede 100644
--- a/nptl/pthreadP.h
+++ b/nptl/pthreadP.h
@@ -162,8 +162,10 @@ __do_cancel (void)
#define SIGCANCEL __SIGRTMIN
-/* Signal needed for the kernel-supported POSIX timer implementation. */
-#define SIGTIMER (__SIGRTMIN + 1)
+/* Signal needed for the kernel-supported POSIX timer implementation.
+ We can reuse the cancellation signal since we can distinguish
+ cancellation from timer expirations. */
+#define SIGTIMER SIGCANCEL
/* Internal prototypes. */
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 <nptl/pthreadP.h>
+#include <sysdeps/unix/sysv/linux/sigprocmask.c>
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 <signal.h>
-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);
}
}
}
diff --git a/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h b/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
index 446394f0db..a2aacc04b1 100644
--- a/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/alpha/bits/siginfo.h
@@ -122,8 +122,10 @@ typedef struct siginfo
signals. */
enum
{
- SI_ASYNCNL = -6, /* Sent by asynch name lookup completion. */
+ SI_ASYNCNL = -60, /* Sent by asynch name lookup completion. */
# define SI_ASYNCNL SI_ASYNCNL
+ SI_TKILL = -6, /* Sent by tkill. */
+# define SI_TKILL SI_TKILL
SI_SIGIO, /* Sent by queued SIGIO. */
# define SI_SIGIO SI_SIGIO
SI_ASYNCIO, /* Sent by AIO completion. */
diff --git a/sysdeps/unix/sysv/linux/bits/siginfo.h b/sysdeps/unix/sysv/linux/bits/siginfo.h
index 102adbcfdd..4ce319dc97 100644
--- a/sysdeps/unix/sysv/linux/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/bits/siginfo.h
@@ -128,8 +128,10 @@ typedef struct siginfo
signals. */
enum
{
- SI_ASYNCNL = -6, /* Sent by asynch name lookup completion. */
+ SI_ASYNCNL = -60, /* Sent by asynch name lookup completion. */
# define SI_ASYNCNL SI_ASYNCNL
+ SI_TKILL = -6, /* Sent by tkill. */
+# define SI_TKILL SI_TKILL
SI_SIGIO, /* Sent by queued SIGIO. */
# define SI_SIGIO SI_SIGIO
SI_ASYNCIO, /* Sent by AIO completion. */
diff --git a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
index fb0e2a524d..f5bbea397a 100644
--- a/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/ia64/bits/siginfo.h
@@ -131,8 +131,10 @@ typedef struct siginfo
signals. */
enum
{
- SI_ASYNCNL = -6, /* Sent by asynch name lookup completion. */
+ SI_ASYNCNL = -60, /* Sent by asynch name lookup completion. */
# define SI_ASYNCNL SI_ASYNCNL
+ SI_TKILL = -6, /* Sent by tkill. */
+# define SI_TKILL SI_TKILL
SI_SIGIO, /* Sent by queued SIGIO. */
# define SI_SIGIO SI_SIGIO
SI_ASYNCIO, /* Sent by AIO completion. */
diff --git a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
index 98a0c30737..0b79853137 100644
--- a/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/s390/bits/siginfo.h
@@ -130,8 +130,10 @@ typedef struct siginfo
signals. */
enum
{
- SI_ASYNCNL = -6, /* Sent by asynch name lookup completion. */
+ SI_ASYNCNL = -60, /* Sent by asynch name lookup completion. */
# define SI_ASYNCNL SI_ASYNCNL
+ SI_TKILL = -6, /* Sent by tkill. */
+# define SI_TKILL SI_TKILL
SI_SIGIO, /* Sent by queued SIGIO. */
# define SI_SIGIO SI_SIGIO
SI_ASYNCIO, /* Sent by AIO completion. */
diff --git a/sysdeps/unix/sysv/linux/sigprocmask.c b/sysdeps/unix/sysv/linux/sigprocmask.c
index 7a73d9c373..db8986aafb 100644
--- a/sysdeps/unix/sysv/linux/sigprocmask.c
+++ b/sysdeps/unix/sysv/linux/sigprocmask.c
@@ -1,4 +1,4 @@
-/* Copyright (C) 1997, 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
+/* 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
@@ -44,6 +44,19 @@ __sigprocmask (how, set, oset)
const sigset_t *set;
sigset_t *oset;
{
+#ifdef SIGCANCEL
+ sigset_t local_newmask;
+
+ /* The only thing we have to make sure here is that SIGCANCEL is not
+ blocked. */
+ if (set != NULL && __builtin_expect (__sigismember (set, SIGCANCEL), 0))
+ {
+ local_newmask = *set;
+ __sigdelset (&local_newmask, SIGCANCEL);
+ set = &local_newmask;
+ }
+#endif
+
#if __ASSUME_REALTIME_SIGNALS > 0
return INLINE_SYSCALL (rt_sigprocmask, 4, how, CHECK_SIGSET_NULL_OK (set),
CHECK_SIGSET_NULL_OK (oset), _NSIG / 8);
diff --git a/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h b/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
index 263b6b8cd1..7ff1971c2a 100644
--- a/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
+++ b/sysdeps/unix/sysv/linux/sparc/bits/siginfo.h
@@ -130,8 +130,10 @@ typedef struct siginfo
signals. */
enum
{
- SI_ASYNCNL = -6, /* Sent by asynch name lookup completion. */
+ SI_ASYNCNL = -60, /* Sent by asynch name lookup completion. */
# define SI_ASYNCNL SI_ASYNCNL
+ SI_TKILL = -6, /* Sent by tkill. */
+# define SI_TKILL SI_TKILL
SI_SIGIO, /* Sent by queued SIGIO. */
# define SI_SIGIO SI_SIGIO
SI_ASYNCIO, /* Sent by AIO completion. */
generated by cgit v1.2.3 (git 2.39.1) at 2024-06-21 02:12:31 +0000