diff options
author | jhb <jhb@FreeBSD.org> | 2003-05-13 20:36:02 +0000 |
---|---|---|
committer | jhb <jhb@FreeBSD.org> | 2003-05-13 20:36:02 +0000 |
commit | 89a4eb17deddba4ba8bfb0cf7c6801a608731f8c (patch) | |
tree | 0e2ba79e40f08e96bb98756b67576ff96caccfbc /sys/kern/kern_synch.c | |
parent | 3b9288c6f4df2bfdc2a41de3ae161246c310e064 (diff) | |
download | FreeBSD-src-89a4eb17deddba4ba8bfb0cf7c6801a608731f8c.zip FreeBSD-src-89a4eb17deddba4ba8bfb0cf7c6801a608731f8c.tar.gz |
- Merge struct procsig with struct sigacts.
- Move struct sigacts out of the u-area and malloc() it using the
M_SUBPROC malloc bucket.
- Add a small sigacts_*() API for managing sigacts structures: sigacts_alloc(),
sigacts_free(), sigacts_copy(), sigacts_share(), and sigacts_shared().
- Remove the p_sigignore, p_sigacts, and p_sigcatch macros.
- Add a mutex to struct sigacts that protects all the members of the struct.
- Add sigacts locking.
- Remove Giant from nosys(), kill(), killpg(), and kern_sigaction() now
that sigacts is locked.
- Several in-kernel functions such as psignal(), tdsignal(), trapsignal(),
and thread_stopped() are now MP safe.
Reviewed by: arch@
Approved by: re (rwatson)
Diffstat (limited to 'sys/kern/kern_synch.c')
-rw-r--r-- | sys/kern/kern_synch.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sys/kern/kern_synch.c b/sys/kern/kern_synch.c index d648e9e..fbf6ed3 100644 --- a/sys/kern/kern_synch.c +++ b/sys/kern/kern_synch.c @@ -230,7 +230,9 @@ msleep(ident, mtx, priority, wmesg, timo) td->td_flags |= TDF_SINTR; mtx_unlock_spin(&sched_lock); PROC_LOCK(p); + mtx_lock(&p->p_sigacts->ps_mtx); sig = cursig(td); + mtx_unlock(&p->p_sigacts->ps_mtx); if (sig == 0 && thread_suspend_check(1)) sig = SIGSTOP; mtx_lock_spin(&sched_lock); @@ -291,12 +293,14 @@ msleep(ident, mtx, priority, wmesg, timo) if (rval == 0 && catch) { PROC_LOCK(p); /* XXX: shouldn't we always be calling cursig() */ + mtx_lock(&p->p_sigacts->ps_mtx); if (sig != 0 || (sig = cursig(td))) { if (SIGISMEMBER(p->p_sigacts->ps_sigintr, sig)) rval = EINTR; else rval = ERESTART; } + mtx_unlock(&p->p_sigacts->ps_mtx); PROC_UNLOCK(p); } #ifdef KTRACE |