Date: Mon, 21 Aug 2006 08:44:24 GMT From: Chris Jones <cdjones@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 104664 for review Message-ID: <200608210844.k7L8iOXS044339@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=104664 Change 104664 by cdjones@cdjones-impulse on 2006/08/21 08:43:45 Finish up the merge of sched_hier back into sched_4bsd. As a bonus, get rid of some debug output. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#5 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#4 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#7 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_4bsd.c#7 edit .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#20 delete Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/NOTES#5 (text+ko) ==== @@ -171,11 +171,7 @@ # advantages for UP as well. It is intended to replace the 4BSD scheduler # over time. # -# SCHED_HIER is an experimental scheduler intended to allow CPU share -# limiting for jails. -# options SCHED_4BSD -#options SCHED_HIER #options SCHED_ULE ##################################################################### ==== //depot/projects/soc2006/cdjones_jail/src/sys/conf/options#4 (text+ko) ==== @@ -126,7 +126,6 @@ PUC_FASTINTR opt_puc.h QUOTA SCHED_4BSD opt_sched.h -SCHED_HIER opt_sched.h SCHED_ULE opt_sched.h SHOW_BUSYBUFS SLEEPQUEUE_PROFILING ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/kern_switch.c#7 (text+ko) ==== @@ -105,7 +105,7 @@ #if defined(SMP) && (defined(__i386__) || defined(__amd64__)) #include <sys/smp.h> #endif -#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) +#if defined(SMP) && defined(SCHED_4BSD) #include <sys/sysctl.h> #endif @@ -234,7 +234,7 @@ } } -#if (defined(SCHED_4BSD) || defined(SCHED_HIER)) +#if defined(SCHED_4BSD) /* * Remove a thread from its KSEGRP's run queue. * This in turn may remove it from a KSE if it was already assigned @@ -856,7 +856,7 @@ return (0); } -#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) +#if defined(SMP) && defined(SCHED_4BSD) int runq_fuzz = 1; SYSCTL_INT(_kern_sched, OID_AUTO, runq_fuzz, CTLFLAG_RW, &runq_fuzz, 0, ""); #endif @@ -874,7 +874,7 @@ mtx_assert(&sched_lock, MA_OWNED); while ((pri = runq_findbit(rq)) != -1) { rqh = &rq->rq_queues[pri]; -#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) +#if defined(SMP) && defined(SCHED_4BSD) /* fuzz == 1 is normal.. 0 or less are ignored */ if (runq_fuzz > 1) { /* ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_4bsd.c#7 (text+ko) ==== @@ -665,11 +665,6 @@ newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE); } - printf("skew KSE %p (%d / %d cpu, %d / %d shares) from %d to %d\n", - &kg, pr->pr_estcpu, total_est_cpu, - pr->pr_sched_shares, - total_cpu_sched_shares, - np, newpriority); } else { newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE);
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200608210844.k7L8iOXS044339>