[src/trunk]: src/lib/libpthread - don't store sigmask on the stack, we could ...

[christos <christos%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ecb571a0566f
branches:  trunk
changeset: 555708:ecb571a0566f
user:      christos <christos%NetBSD.org@localhost>
date:      Tue Nov 25 22:26:44 2003 +0000

description:
- don't store sigmask on the stack, we could store it in the right place
  [in the context]
- this has the side effect of fixing the problem of the signal mask not
  being preserved properly upon signal return, found and fixed by cl.
- add si_code to the tramp debugging output (requested by cl).

diffstat:

 lib/libpthread/pthread_sig.c |  29 ++++++++++++-----------------
 1 files changed, 12 insertions(+), 17 deletions(-)

diffs (82 lines):

diff -r f9132dd6c96c -r ecb571a0566f lib/libpthread/pthread_sig.c
--- a/lib/libpthread/pthread_sig.c      Tue Nov 25 21:59:31 2003 +0000
+++ b/lib/libpthread/pthread_sig.c      Tue Nov 25 22:26:44 2003 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: pthread_sig.c,v 1.27 2003/11/20 17:45:00 uwe Exp $     */
+/*     $NetBSD: pthread_sig.c,v 1.28 2003/11/25 22:26:44 christos Exp $        */
 
 /*-
  * Copyright (c) 2001 The NetBSD Foundation, Inc.
@@ -37,7 +37,7 @@
  */
 
 #include <sys/cdefs.h>
-__RCSID("$NetBSD: pthread_sig.c,v 1.27 2003/11/20 17:45:00 uwe Exp $");
+__RCSID("$NetBSD: pthread_sig.c,v 1.28 2003/11/25 22:26:44 christos Exp $");
 
 /* We're interposing a specific version of the signal interface. */
 #define        __LIBC12_SOURCE__
@@ -837,7 +837,7 @@
 void
 pthread__deliver_signal(pthread_t self, pthread_t target, siginfo_t *si)
 {
-       sigset_t oldmask, *maskp;
+       sigset_t oldmask;
        ucontext_t *uc, *olduc;
        struct sigaction act;
        siginfo_t *siginfop;
@@ -867,11 +867,8 @@
         * handler. So we borrow a bit of space from the target's
         * stack, which we were adjusting anyway.
         */
-       maskp = (sigset_t *)(void *)((char *)(void *)olduc -
-           STACKSPACE - sizeof(sigset_t));
-       *maskp = oldmask;
-       siginfop = (siginfo_t *)(void *)((char *)(void *)maskp -
-           sizeof(*siginfop));
+       siginfop = (siginfo_t *)(void *)((char *)(void *)olduc -
+           STACKSPACE - sizeof(siginfo_t));
        *siginfop = *si;
 
        /*
@@ -885,12 +882,13 @@
 #endif
 
        _INITCONTEXT_U(uc);
+       uc->uc_sigmask = oldmask;
        uc->uc_stack.ss_sp = uc;
        uc->uc_stack.ss_size = 0;
        uc->uc_link = NULL;
 
        SDPRINTF(("(makecontext %p): target %p: sig: %d uc: %p oldmask: %08x\n",
-           self, target, si->si_signo, olduc, maskp->__bits[0]));
+           self, target, si->si_signo, olduc, oldmask.__bits[0]));
        makecontext(uc, pthread__signal_tramp, 3, act.sa_handler, siginfop,
            olduc);
        target->pt_uc = uc;
@@ -919,20 +917,17 @@
 pthread__signal_tramp(void (*handler)(int, siginfo_t *, void *),
     siginfo_t *info, ucontext_t *uc)
 {
-       SDPRINTF(("(tramp %p) sig %d uc %p oldmask %08x\n", 
-           pthread__self(), info->si_signo, uc, uc->uc_sigmask.__bits[0]));
+       SDPRINTF(("(tramp %p) sig %d code %d uc %p oldmask %08x\n", 
+           pthread__self(), info->si_signo, info->si_code, uc,
+           uc->uc_sigmask.__bits[0]));
 
 #ifdef __HAVE_SIGINFO
        (*handler)(info->si_signo, info, uc);
 #else
        {
                struct pthread__sigcontext psc;
-               /*
-                * XXX we don't support siginfo here yet.
-                * Note that the old sigmask is below info in the stack.
-                */
-               sigset_t *maskp = (sigset_t *)(void *)&info[1];
-               PTHREAD_UCONTEXT_TO_SIGCONTEXT(maskp, uc, &psc);
+
+               PTHREAD_UCONTEXT_TO_SIGCONTEXT(&uc->uc_sigmask, uc, &psc);
                ((void *(*)(int, int, struct sigcontext *))handler)
                    (info->si_signo, info->si_trap, &psc.psc_context);
                PTHREAD_SIGCONTEXT_TO_UCONTEXT(&psc, uc);