svn commit: r230178 - stable/8/sys/kern

[Andriy Gapon]

Author: avg
Date: Sun Jan 15 22:47:49 2012
New Revision: 230178
URL: http://svn.freebsd.org/changeset/base/230178

Log:
  MFC r228718: ule: ensure that batch timeshare threads are scheduled
  fairly
  
  Second take.

Modified:
  stable/8/sys/kern/sched_ule.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)

Modified: stable/8/sys/kern/sched_ule.c
==============================================================================
--- stable/8/sys/kern/sched_ule.c	Sun Jan 15 22:43:34 2012	(r230177)
+++ stable/8/sys/kern/sched_ule.c	Sun Jan 15 22:47:49 2012	(r230178)
@@ -413,7 +413,6 @@ sched_shouldpreempt(int pri, int cpri, i
 	return (0);
 }
 
-#define	TS_RQ_PPQ	(((PRI_MAX_BATCH - PRI_MIN_BATCH) + 1) / RQ_NQS)
 /*
  * Add a thread to the actual run-queue.  Keeps transferable counts up to
  * date with what is actually on the run-queue.  Selects the correct
@@ -446,7 +445,8 @@ tdq_runq_add(struct tdq *tdq, struct thr
 		 * realtime.  Use the whole queue to represent these values.
 		 */
 		if ((flags & (SRQ_BORROWING|SRQ_PREEMPTED)) == 0) {
-			pri = (pri - PRI_MIN_BATCH) / TS_RQ_PPQ;
+			pri = RQ_NQS * (pri - PRI_MIN_BATCH) /
+			    (PRI_MAX_BATCH - PRI_MIN_BATCH + 1);
 			pri = (pri + tdq->tdq_idx) % RQ_NQS;
 			/*
 			 * This effectively shortens the queue by one so we