From owner-p4-projects@FreeBSD.ORG Mon Aug 21 08:44:26 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 0D25D16A50A; Mon, 21 Aug 2006 08:44:26 +0000 (UTC) X-Original-To: perforce@FreeBSD.org Delivered-To: perforce@FreeBSD.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 9491816A501 for ; Mon, 21 Aug 2006 08:44:25 +0000 (UTC) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 2637643D46 for ; Mon, 21 Aug 2006 08:44:25 +0000 (GMT) (envelope-from cdjones@FreeBSD.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k7L8iOfJ044342 for ; Mon, 21 Aug 2006 08:44:25 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7L8iOXS044339 for perforce@freebsd.org; Mon, 21 Aug 2006 08:44:24 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 21 Aug 2006 08:44:24 GMT Message-Id: <200608210844.k7L8iOXS044339@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to cdjones@FreeBSD.org using -f From: Chris Jones To: Perforce Change Reviews Cc: Subject: PERFORCE change 104664 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 21 Aug 2006 08:44:26 -0000 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 #endif -#if defined(SMP) && (defined(SCHED_4BSD) || defined(SCHED_HIER)) +#if defined(SMP) && defined(SCHED_4BSD) #include #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);