 @@ -1,14 +1,14 @@
-/*	$NetBSD: sched_4bsd.c,v 1.27 2011/07/27 14:35:34 uebayasi Exp $	*/
+/*	$NetBSD: sched_4bsd.c,v 1.28 2011/12/02 12:29:35 yamt Exp $	*/
 /*-
  * Copyright (c) 1999, 2000, 2004, 2006, 2007, 2008 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by Jason R. Thorpe of the Numerical Aerospace Simulation Facility,
  * NASA Ames Research Center, by Charles M. Hannum, Andrew Doran, and
  * Daniel Sieger.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
 @@ -58,27 +58,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
+ *
  *	@(#)kern_synch.c	8.9 (Berkeley) 5/19/95
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: sched_4bsd.c,v 1.27 2011/07/27 14:35:34 uebayasi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: sched_4bsd.c,v 1.28 2011/12/02 12:29:35 yamt Exp $");
 #include "opt_ddb.h"
 #include "opt_lockdebug.h"
 #include "opt_perfctrs.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/callout.h>
 #include <sys/cpu.h>
 #include <sys/proc.h>
 #include <sys/kernel.h>
 #include <sys/signalvar.h>
 #include <sys/resourcevar.h>
 @@ -364,38 +364,37 @@ resetpriority(struct lwp *l)
 	KASSERT(lwp_locked(l, NULL));
 	if (l->l_class != SCHED_OTHER)
 		return;
 	/* See comments above ESTCPU_SHIFT definition. */
 	pri = (PRI_KERNEL - 1) - (l->l_estcpu >> ESTCPU_SHIFT) - p->p_nice;
 	pri = imax(pri, 0);
 	if (pri != l->l_priority)
 		lwp_changepri(l, pri);
+}
 /*
- * We adjust the priority of the current process.  The priority of a process
+ * We adjust the priority of the current LWP.  The priority of a LWP
  * gets worse as it accumulates CPU time.  The CPU usage estimator (l_estcpu)
- * is increased here.  The formula for computing priorities (in kern_synch.c)
+ * is increased here.  The formula for computing priorities will compute a
- * will compute a different value each time l_estcpu increases. This can
+ * different value each time l_estcpu increases. This can cause a switch,
- * cause a switch, but unless the priority crosses a PPQ boundary the actual
+ * but unless the priority crosses a PPQ boundary the actual queue will not
- * queue will not change.  The CPU usage estimator ramps up quite quickly
+ * change.  The CPU usage estimator ramps up quite quickly when the process
- * when the process is running (linearly), and decays away exponentially, at
+ * is running (linearly), and decays away exponentially, at a rate which is
- * a rate which is proportionally slower when the system is busy.  The basic
+ * proportionally slower when the system is busy.  The basic principle is
- * principle is that the system will 90% forget that the process used a lot
+ * that the system will 90% forget that the process used a lot of CPU time
- * of CPU time in 5 * loadav seconds.  This causes the system to favor
+ * in 5 * loadav seconds.  This causes the system to favor processes which
- * processes which haven't run much recently, and to round-robin among other
+ * haven't run much recently, and to round-robin among other processes.
  * processes.
  */
 void
 sched_schedclock(struct lwp *l)
+{
 	if (l->l_class != SCHED_OTHER)
 		return;
 	KASSERT(!CURCPU_IDLE_P());
 	l->l_estcpu = ESTCPULIM(l->l_estcpu + ESTCPU_ACCUM);
 	lwp_lock(l);
 	resetpriority(l);