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

exit: get rid of PROC_SLOCK when checking a process to report, take #2

Browse Source 
The suspension counter needs synchronisation through slock, but we don't
need it to check if inspecting the counter is necessary to begin with.
In the common case it is not, thus avoid the lock if possible.

Reviewed by:	kib
Tested by:	pho
This commit is contained in:
Mateusz Guzik 2018-02-18 21:07:15 +00:00
parent af85a3d172
commit 7beb60820f
1 changed files with 21 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
sys/kern/kern_exit.c
View File

@ -1174,6 +1174,7 @@ kern_wait6(struct thread *td, idtype_t idtype, id_t id, int *status,
struct proc *p, *q; struct proc *p, *q;
pid_t pid; pid_t pid;
int error, nfound, ret; int error, nfound, ret;
bool report;
AUDIT_ARG_VALUE((int)idtype); /* XXX - This is likely wrong! */ AUDIT_ARG_VALUE((int)idtype); /* XXX - This is likely wrong! */
AUDIT_ARG_PID((pid_t)id); /* XXX - This may be wrong! */ AUDIT_ARG_PID((pid_t)id); /* XXX - This may be wrong! */
@ -1225,36 +1226,38 @@ kern_wait6(struct thread *td, idtype_t idtype, id_t id, int *status,
nfound++; nfound++;
PROC_LOCK_ASSERT(p, MA_OWNED); PROC_LOCK_ASSERT(p, MA_OWNED);
if ((options & (WTRAPPED | WUNTRACED)) != 0)
PROC_SLOCK(p);
if ((options & WTRAPPED) != 0 && if ((options & WTRAPPED) != 0 &&
(p->p_flag & P_TRACED) != 0 && (p->p_flag & P_TRACED) != 0) {
(p->p_flag & (P_STOPPED_TRACE | P_STOPPED_SIG)) != 0 && PROC_SLOCK(p);
p->p_suspcount == p->p_numthreads && report =
(p->p_flag & P_WAITED) == 0) { ((p->p_flag & (P_STOPPED_TRACE | P_STOPPED_SIG)) &&
p->p_suspcount == p->p_numthreads &&
(p->p_flag & P_WAITED) == 0);
PROC_SUNLOCK(p); PROC_SUNLOCK(p);
if (report) {
CTR4(KTR_PTRACE, CTR4(KTR_PTRACE,
"wait: returning trapped pid %d status %#x " "wait: returning trapped pid %d status %#x "
"(xstat %d) xthread %d", "(xstat %d) xthread %d",
p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig, p->p_pid, W_STOPCODE(p->p_xsig), p->p_xsig,
p->p_xthread != NULL ? p->p_xthread != NULL ?
p->p_xthread->td_tid : -1); p->p_xthread->td_tid : -1);
report_alive_proc(td, p, siginfo, status, options, report_alive_proc(td, p, siginfo, status,
CLD_TRAPPED); options, CLD_TRAPPED);
return (0); return (0);
}
} }
if ((options & WUNTRACED) != 0 && if ((options & WUNTRACED) != 0 &&
(p->p_flag & P_STOPPED_SIG) != 0 && (p->p_flag & P_STOPPED_SIG) != 0) {
p->p_suspcount == p->p_numthreads && PROC_SLOCK(p);
(p->p_flag & P_WAITED) == 0) { report = (p->p_suspcount == p->p_numthreads &&
((p->p_flag & P_WAITED) == 0));
PROC_SUNLOCK(p); PROC_SUNLOCK(p);
report_alive_proc(td, p, siginfo, status, options, if (report) {
CLD_STOPPED); report_alive_proc(td, p, siginfo, status,
return (0); options, CLD_STOPPED);
return (0);
}
} }
if ((options & (WTRAPPED | WUNTRACED)) != 0)
PROC_SUNLOCK(p);
if ((options & WCONTINUED) != 0 && if ((options & WCONTINUED) != 0 &&
(p->p_flag & P_CONTINUED) != 0) { (p->p_flag & P_CONTINUED) != 0) {
report_alive_proc(td, p, siginfo, status, options, report_alive_proc(td, p, siginfo, status, options,