diff options
| author | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-15 04:52:41 +0000 |
|---|---|---|
| committer | Philip Guenthe <guenther@cvs.openbsd.org> | 2011-04-15 04:52:41 +0000 |
| commit | 71771abcbf45c58af4735979b21a2e7604cb42bf (patch) | |
| tree | 1e12c4f7e6473b7549d0bf973e6f96bd314644b8 /sys/kern/kern_exit.c | |
| parent | 847e8a9bf0e99af86e8791ea570d84b9d3bc54f9 (diff) | |
Correct the sharing of the signal handling state: stuff that should
be shared (p_sigignore, p_sigcatch, P_NOCLDSTOP, P_NOCLDWAIT) moves
to struct sigacts, wihle stuff that should be per rthread (ps_oldmask,
SAS_OLDMASK, ps_sigstk) moves to struct proc. Treat the coredumping
state bits (ps_sig, ps_code, ps_type, ps_sigval) as per-rthread
until our locking around coredumping is better.
Oh, and remove the old SunOS-compat ps_usertramp member.
"I like the sound of this" tedu@
Diffstat (limited to 'sys/kern/kern_exit.c')
| -rw-r--r-- | sys/kern/kern_exit.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sys/kern/kern_exit.c b/sys/kern/kern_exit.c index 40c73d9a7ab..854743e5183 100644 --- a/sys/kern/kern_exit.c +++ b/sys/kern/kern_exit.c @@ -1,4 +1,4 @@ -/* $OpenBSD: kern_exit.c,v 1.98 2011/04/03 14:56:28 guenther Exp $ */ +/* $OpenBSD: kern_exit.c,v 1.99 2011/04/15 04:52:40 guenther Exp $ */ /* $NetBSD: kern_exit.c,v 1.39 1996/04/22 01:38:25 christos Exp $ */ /* @@ -176,7 +176,6 @@ exit1(struct proc *p, int rv, int flags) if (p->p_flag & P_PROFIL) stopprofclock(p); p->p_ru = pool_get(&rusage_pool, PR_WAITOK); - p->p_sigignore = ~0; p->p_siglist = 0; timeout_del(&p->p_realit_to); timeout_del(&p->p_stats->p_virt_to); @@ -305,11 +304,12 @@ exit1(struct proc *p, int rv, int flags) /* * Notify parent that we're gone. If we have P_NOZOMBIE - * or parent has the P_NOCLDWAIT flag set, notify process 1 + * or parent has the SAS_NOCLDWAIT flag set, notify process 1 * instead (and hope it will handle this situation). */ if ((p->p_flag & P_NOZOMBIE) || - (pr->ps_pptr->ps_mainproc->p_flag & P_NOCLDWAIT)) { + (pr->ps_pptr->ps_mainproc->p_sigacts->ps_flags & + SAS_NOCLDWAIT)) { struct process *ppr = pr->ps_pptr; proc_reparent(pr, initproc->p_p); /* |