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

Fixed a logic bug that caused the vmdaemon to not wake up when intended.

Browse Source 
Submitted by:	John Dyson
This commit is contained in:
David Greenman 1995-04-17 10:00:55 +00:00
parent 59423ca335
commit 4c1f8ee9b8
1 changed files with 27 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
sys/vm/vm_pageout.c
View File

@ -65,7 +65,7 @@
* any improvements or extensions that they make and grant Carnegie the * any improvements or extensions that they make and grant Carnegie the
* rights to redistribute these changes. * rights to redistribute these changes.
* *
* $Id: vm_pageout.c,v 1.46 1995/04/16 12:56:22 davidg Exp $ * $Id: vm_pageout.c,v 1.47 1995/04/16 14:12:15 davidg Exp $
*/ */
/* /*
@ -526,20 +526,6 @@ vm_pageout_scan()
int force_wakeup = 0; int force_wakeup = 0;
int vnodes_skipped = 0; int vnodes_skipped = 0;
/* calculate the total cached size */
if ((cnt.v_inactive_count + cnt.v_free_count + cnt.v_cache_count) <
(cnt.v_inactive_target + cnt.v_free_min)) {
vm_req_vmdaemon();
}
/*
* now swap processes out if we are in low memory conditions
*/
if ((cnt.v_free_count <= cnt.v_free_min) &&
!swap_pager_full && vm_swap_size && vm_pageout_req_swapout == 0) {
vm_pageout_req_swapout = 1;
vm_req_vmdaemon();
}
pages_freed = 0; pages_freed = 0;
/* /*
@ -750,8 +736,10 @@ vm_pageout_scan()
/* /*
* If we didn't get enough free pages, and we have skipped a vnode * If we didn't get enough free pages, and we have skipped a vnode
* in a writeable object, wakeup the sync daemon. * in a writeable object, wakeup the sync daemon. And kick swapout
* if we did not get enough free pages.
*/ */
if ((cnt.v_cache_count + cnt.v_free_count) < cnt.v_free_target) {
if (vnodes_skipped && if (vnodes_skipped &&
(cnt.v_cache_count + cnt.v_free_count) < cnt.v_free_min) { (cnt.v_cache_count + cnt.v_free_count) < cnt.v_free_min) {
if (!vfs_update_wakeup) { if (!vfs_update_wakeup) {
@ -759,6 +747,20 @@ vm_pageout_scan()
wakeup((caddr_t) &vfs_update_wakeup); wakeup((caddr_t) &vfs_update_wakeup);
} }
} }
/*
* now swap processes out if we are in low memory conditions
*/
if (!swap_pager_full && vm_swap_size &&
vm_pageout_req_swapout == 0) {
vm_pageout_req_swapout = 1;
vm_req_vmdaemon();
}
}
if ((cnt.v_inactive_count + cnt.v_free_count + cnt.v_cache_count) <
(cnt.v_inactive_target + cnt.v_free_min)) {
vm_req_vmdaemon();
}
/* /*
* make sure that we have swap space -- if we are low on memory and * make sure that we have swap space -- if we are low on memory and
@ -883,7 +885,10 @@ vm_daemon()
while (TRUE) { while (TRUE) {
tsleep((caddr_t) &vm_daemon_needed, PUSER, "psleep", 0); tsleep((caddr_t) &vm_daemon_needed, PUSER, "psleep", 0);
if( vm_pageout_req_swapout) {
swapout_threads(); swapout_threads();
vm_pageout_req_swapout = 0;
}
/* /*
* scan the processes for exceeding their rlimits or if * scan the processes for exceeding their rlimits or if
* process is swapped out -- deactivate pages * process is swapped out -- deactivate pages