d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

- trapsignal() no longer needs to acquire Giant for ktrpsig().

Browse Source 
- Catch up to new ktrace API.
This commit is contained in:
John Baldwin 2002-06-07 05:43:02 +00:00
parent af300f2367
commit 374a15aa55
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=97999
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sys/kern/kern_sig.c
View File

@ -1193,15 +1193,14 @@ trapsignal(p, sig, code)
{
register struct sigacts *ps = p->p_sigacts;
mtx_lock(&Giant);
PROC_LOCK(p);
if ((p->p_flag & P_TRACED) == 0 && SIGISMEMBER(p->p_sigcatch, sig) &&
!SIGISMEMBER(p->p_sigmask, sig)) {
p->p_stats->p_ru.ru_nsignals++;
#ifdef KTRACE
if (KTRPOINT(p, KTR_PSIG))
ktrpsig(p->p_tracep, sig, ps->ps_sigact[_SIG_IDX(sig)],
&p->p_sigmask, code);
if (KTRPOINT(curthread, KTR_PSIG))
ktrpsig(sig, ps->ps_sigact[_SIG_IDX(sig)],
&p->p_sigmask, code);
#endif
(*p->p_sysent->sv_sendsig)(ps->ps_sigact[_SIG_IDX(sig)], sig,
&p->p_sigmask, code);
@ -1224,7 +1223,6 @@ trapsignal(p, sig, code)
psignal(p, sig);
}
PROC_UNLOCK(p);
mtx_unlock(&Giant);
}
/*
@ -1735,8 +1733,8 @@ postsig(sig)
SIGDELSET(p->p_siglist, sig);
action = ps->ps_sigact[_SIG_IDX(sig)];
#ifdef KTRACE
if (KTRPOINT(p, KTR_PSIG))
ktrpsig(p->p_tracep, sig, action, p->p_flag & P_OLDMASK ?
if (KTRPOINT(td, KTR_PSIG))
ktrpsig(sig, action, p->p_flag & P_OLDMASK ?
&p->p_oldsigmask : &p->p_sigmask, 0);
#endif
_STOPEVENT(p, S_SIG, sig);