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

session: tidy up fixjobc

Browse Source 
This stops abusing the 'p' pointer for iteration over children processes
and gets rid of useless locking around PRS_ZOMBIE check.

Suggested by:	kib
This commit is contained in:
Mateusz Guzik 2016-01-20 23:22:36 +00:00
parent 8688f98d23
commit 6760182c5d
1 changed files with 7 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sys/kern/kern_proc.c
View File

@ -650,13 +650,11 @@ pgadjustjobc(pgrp, entering)
* entering == 1 => p is entering specified group.
*/
void
fixjobc(p, pgrp, entering)
register struct proc *p;
register struct pgrp *pgrp;
int entering;
fixjobc(struct proc *p, struct pgrp *pgrp, int entering)
{
register struct pgrp *hispgrp;
register struct session *mysession;
struct pgrp *hispgrp;
struct session *mysession;
struct proc *q;
sx_assert(&proctree_lock, SX_LOCKED);
PROC_LOCK_ASSERT(p, MA_NOTOWNED);
@ -677,17 +675,13 @@ fixjobc(p, pgrp, entering)
* their process groups; if so, adjust counts for children's
* process groups.
*/
LIST_FOREACH(p, &p->p_children, p_sibling) {
hispgrp = p->p_pgrp;
LIST_FOREACH(q, &p->p_children, p_sibling) {
hispgrp = q->p_pgrp;
if (hispgrp == pgrp ||
hispgrp->pg_session != mysession)
continue;
PROC_LOCK(p);
if (p->p_state == PRS_ZOMBIE) {
PROC_UNLOCK(p);
if (q->p_state == PRS_ZOMBIE)
continue;
}
PROC_UNLOCK(p);
pgadjustjobc(hispgrp, entering);
}
}