Author: avg
Date: Sun Jan 15 22:10:35 2012
New Revision: 230173
URL: http://svn.freebsd.org/changeset/base/230173

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

Modified:
  stable/9/sys/kern/sched_ule.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/amd64/include/xen/   (props changed)
  stable/9/sys/boot/   (props changed)
  stable/9/sys/boot/i386/efi/   (props changed)
  stable/9/sys/boot/ia64/efi/   (props changed)
  stable/9/sys/boot/ia64/ski/   (props changed)
  stable/9/sys/boot/powerpc/boot1.chrp/   (props changed)
  stable/9/sys/boot/powerpc/ofw/   (props changed)
  stable/9/sys/cddl/contrib/opensolaris/   (props changed)
  stable/9/sys/conf/   (props changed)
  stable/9/sys/contrib/dev/acpica/   (props changed)
  stable/9/sys/contrib/octeon-sdk/   (props changed)
  stable/9/sys/contrib/pf/   (props changed)
  stable/9/sys/contrib/x86emu/   (props changed)

Modified: stable/9/sys/kern/sched_ule.c
==============================================================================
--- stable/9/sys/kern/sched_ule.c       Sun Jan 15 22:08:44 2012        
(r230172)
+++ stable/9/sys/kern/sched_ule.c       Sun Jan 15 22:10:35 2012        
(r230173)
@@ -125,6 +125,7 @@ static struct td_sched td_sched0;
  */
 #define        PRI_TIMESHARE_RANGE     (PRI_MAX_TIMESHARE - PRI_MIN_TIMESHARE 
+ 1)
 #define        PRI_INTERACT_RANGE      ((PRI_TIMESHARE_RANGE - 
SCHED_PRI_NRESV) / 2)
+#define        PRI_BATCH_RANGE         (PRI_TIMESHARE_RANGE - 
PRI_INTERACT_RANGE)
 
 #define        PRI_MIN_INTERACT        PRI_MIN_TIMESHARE
 #define        PRI_MAX_INTERACT        (PRI_MIN_TIMESHARE + PRI_INTERACT_RANGE 
- 1)
@@ -416,7 +417,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
@@ -449,7 +449,7 @@ 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_BATCH_RANGE;
                        pri = (pri + tdq->tdq_idx) % RQ_NQS;
                        /*
                         * This effectively shortens the queue by one so we
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"

Reply via email to