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

- Check that a process isn't a new process (p_state == PRS_NEW) before

Browse Source 
trying to acquire it's proc lock since the proc lock may not have been
  constructed yet.
- Split up the one big comment at the top of the loop and put the pieces
  in the right order above the various checks.

Reported by:	kris (1)
This commit is contained in:
John Baldwin 2002-10-22 14:31:32 +00:00
parent f7b951a8e0
commit 1c865ac70e
1 changed files with 23 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
sys/vm/vm_glue.c
View File

@ -660,21 +660,18 @@ retry:
int minslptime = 100000;
/*
* Do not swapout a process that
* is waiting for VM data
* structures there is a possible
* deadlock. Test this first as
* this may block.
*
* Lock the map until swapout
* finishes, or a thread of this
* process may attempt to alter
* the map.
*
* Watch out for a process in
* creation. It may have no
* address space yet.
*
* address space or lock yet.
*/
mtx_lock_spin(&sched_lock);
if (p->p_state == PRS_NEW) {
mtx_unlock_spin(&sched_lock);
continue;
}
mtx_unlock_spin(&sched_lock);
/*
* An aio daemon switches its
* address space while running.
* Perform a quick check whether
@ -685,17 +682,23 @@ retry:
PROC_UNLOCK(p);
continue;
}
mtx_lock_spin(&sched_lock);
if (p->p_state == PRS_NEW) {
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p);
continue;
}
/*
* Do not swapout a process that
* is waiting for VM data
* structures as there is a possible
* deadlock. Test this first as
* this may block.
*
* Lock the map until swapout
* finishes, or a thread of this
* process may attempt to alter
* the map.
*/
vm = p->p_vmspace;
KASSERT(vm != NULL,
("swapout_procs: a process has no address space"));
++vm->vm_refcnt;
mtx_unlock_spin(&sched_lock);
PROC_UNLOCK(p);
if (!vm_map_trylock(&vm->vm_map))
goto nextproc1;