CVS commit: [matt-nb5-mips64] src/sys/uvm

[Matt Thomas]

Module Name:    src
Committed By:   matt
Date:           Fri Apr 27 20:41:09 UTC 2012

Modified Files:
        src/sys/uvm [matt-nb5-mips64]: uvm_pdaemon.c uvm_pdpolicy_clock.c

Log Message:
Don't decrement pgrp_active in radioactive page dequeue since we don't
increment it when activated a radioactive page.


To generate a diff of this commit:
cvs rdiff -u -r1.93.4.2.4.13 -r1.93.4.2.4.14 src/sys/uvm/uvm_pdaemon.c
cvs rdiff -u -r1.12.16.7 -r1.12.16.8 src/sys/uvm/uvm_pdpolicy_clock.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/uvm/uvm_pdaemon.c
diff -u src/sys/uvm/uvm_pdaemon.c:1.93.4.2.4.13 src/sys/uvm/uvm_pdaemon.c:1.93.4.2.4.14
--- src/sys/uvm/uvm_pdaemon.c:1.93.4.2.4.13	Tue Apr 17 00:19:30 2012
+++ src/sys/uvm/uvm_pdaemon.c	Fri Apr 27 20:41:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.13 2012/04/17 00:19:30 matt Exp $	*/
+/*	$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.14 2012/04/27 20:41:09 matt Exp $	*/
 
 /*
  * Copyright (c) 1997 Charles D. Cranor and Washington University.
@@ -71,7 +71,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.13 2012/04/17 00:19:30 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdaemon.c,v 1.93.4.2.4.14 2012/04/27 20:41:09 matt Exp $");
 
 #include "opt_uvmhist.h"
 #include "opt_readahead.h"
@@ -405,7 +405,6 @@ uvm_pageout(void *arg)
 			UVMHIST_LOG(pdhist,"  <<WOKE UP>>",0,0,0,0);
 			want_tune = pdinfo->pd_stalled;
 			pdinfo->pd_stalled = false;
-			progress = false;
 		} else if (TAILQ_FIRST(&pdinfo->pd_pendingq) == NULL) {
 			/*
 			 * Someone is waiting but no group are pending.
@@ -440,6 +439,7 @@ uvm_pageout(void *arg)
 		 * system only when entire pool page is empty.
 		 */
 		bool need_wakeup = false;
+		progress = false;
 		while ((grp = TAILQ_FIRST(&pdinfo->pd_pendingq)) != NULL) {
 			KASSERT(grp->pgrp_npages > 0);
 

Index: src/sys/uvm/uvm_pdpolicy_clock.c
diff -u src/sys/uvm/uvm_pdpolicy_clock.c:1.12.16.7 src/sys/uvm/uvm_pdpolicy_clock.c:1.12.16.8
--- src/sys/uvm/uvm_pdpolicy_clock.c:1.12.16.7	Tue Apr 17 00:12:21 2012
+++ src/sys/uvm/uvm_pdpolicy_clock.c	Fri Apr 27 20:41:09 2012
@@ -1,4 +1,4 @@
-/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.7 2012/04/17 00:12:21 matt Exp $	*/
+/*	$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.8 2012/04/27 20:41:09 matt Exp $	*/
 /*	NetBSD: uvm_pdaemon.c,v 1.72 2006/01/05 10:47:33 yamt Exp $	*/
 
 /*
@@ -74,7 +74,7 @@
 #else /* defined(PDSIM) */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.7 2012/04/17 00:12:21 matt Exp $");
+__KERNEL_RCSID(0, "$NetBSD: uvm_pdpolicy_clock.c,v 1.12.16.8 2012/04/27 20:41:09 matt Exp $");
 
 #include <sys/param.h>
 #include <sys/proc.h>
@@ -434,7 +434,6 @@ uvmpdpol_pagedequeue(struct vm_page *pg)
 		pg->pqflags &= ~PQ_RADIOACTIVE;
 		KASSERT(gs->gs_radioactive > 0);
 		gs->gs_radioactive--;
-		grp->pgrp_active--;
 	}
 
 	//KDASSERT(gs->gs_radioactive == clock_pglist_count(&gs->gs_radioactiveq));