From 69b40456576eda9dd4dbcdc186e4a7f4020d8906 Mon Sep 17 00:00:00 2001 From: John Baldwin Date: Wed, 24 Jan 2001 12:23:17 +0000 Subject: [PATCH] Argh, I didn't get this test right when I converted it. Break this up into two separate if's instead of nested if's. Also, reorder things slightly to avoid unnecessary mutex operations. --- sys/vm/vm_glue.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sys/vm/vm_glue.c b/sys/vm/vm_glue.c index 6e6f7985943..f9154030615 100644 --- a/sys/vm/vm_glue.c +++ b/sys/vm/vm_glue.c @@ -448,20 +448,19 @@ retry: struct vmspace *vm; PROC_LOCK(p); - if (!(p->p_lock == 0 && - (p->p_flag & (P_TRACED|P_SYSTEM|P_WEXIT)) == 0)) { - mtx_enter(&sched_lock, MTX_SPIN); - if ((p->p_sflag & (PS_INMEM|PS_SWAPPING)) == PS_INMEM) { - mtx_exit(&sched_lock, MTX_SPIN); - PROC_UNLOCK(p); - continue; - } - mtx_exit(&sched_lock, MTX_SPIN); + if (p->p_lock != 0 || + (p->p_flag & (P_TRACED|P_SYSTEM|P_WEXIT)) != 0) { + PROC_UNLOCK(p); + continue; } vm = p->p_vmspace; PROC_UNLOCK(p); - mtx_enter(&sched_lock, MTX_SPIN); + if ((p->p_sflag & (PS_INMEM|PS_SWAPPING)) != PS_INMEM) { + mtx_exit(&sched_lock, MTX_SPIN); + continue; + } + switch (p->p_stat) { default: mtx_exit(&sched_lock, MTX_SPIN);