From owner-p4-projects@FreeBSD.ORG Mon Aug 21 02:10:02 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 452A916A4DE; Mon, 21 Aug 2006 02:10:02 +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 20E6A16A4DA for ; Mon, 21 Aug 2006 02:10:02 +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 B4A4743D45 for ; Mon, 21 Aug 2006 02:10:01 +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 k7L2A1u1006240 for ; Mon, 21 Aug 2006 02:10:01 GMT (envelope-from cdjones@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k7L2A10d006237 for perforce@freebsd.org; Mon, 21 Aug 2006 02:10:01 GMT (envelope-from cdjones@FreeBSD.org) Date: Mon, 21 Aug 2006 02:10:01 GMT Message-Id: <200608210210.k7L2A10d006237@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 104647 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 02:10:02 -0000 http://perforce.freebsd.org/chv.cgi?CH=104647 Change 104647 by cdjones@cdjones-impulse on 2006/08/21 02:09:21 Reduce spamminess, get rid of unused code. Affected files ... .. //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#18 edit Differences ... ==== //depot/projects/soc2006/cdjones_jail/src/sys/kern/sched_hier.c#18 (text+ko) ==== @@ -177,7 +177,7 @@ static int forward_wakeup(int cpunum); #endif -static uint32_t total_jail_sched_shares; +static uint32_t total_cpu_sched_shares; static u_int total_est_cpu; extern struct mtx allprison_mtx; extern int prisoncount; @@ -572,9 +572,7 @@ { int nowake; struct prison *pr; - u_int32_t nShares = 0; - u_int nCpu = 0; - unsigned int counter = 0; + u_int32_t shares = 0; for (;;) { /* @@ -587,16 +585,11 @@ * when jail CPU shares are added / changed, rather than * doing it every second. */ - nShares = sched_unjailedProcessShares; - nCpu = 0; + shares = sched_unjailedProcessShares; LIST_FOREACH(pr, &allprison, pr_list) { - nShares += pr->pr_sched_shares; - nCpu += pr->pr_estcpu; + shares += pr->pr_sched_shares; } - if (0 == (counter % 10)) - printf("schedcpu_thread: %d CPU shares total, %d / %d CPU est. usage\n", - nShares, nCpu, total_est_cpu); - total_jail_sched_shares = nShares; + total_cpu_sched_shares = shares; counter++; schedcpu(); @@ -657,7 +650,7 @@ */ register unsigned int np = newpriority; register unsigned int skew; - skew = pr->pr_estcpu * total_jail_sched_shares; + skew = pr->pr_estcpu * total_cpu_sched_shares; skew /= max(total_est_cpu, 1) * max(pr->pr_sched_shares, 1); if (skew > 0) { /* wait your turn until your cpu usage's proportionate */ @@ -666,24 +659,10 @@ newpriority = min(max(newpriority, PRI_MIN_TIMESHARE), PRI_MAX_TIMESHARE); } -/* - a = skew; - skew *= pr->pr_sched_shares; - b = skew; - skew *= pr->pr_estcpu; - c = skew; */ - /* avoid divide-by-zero hazards */ -/* skew /= max(total_jail_sched_shares, 1); - d = skew; - skew /= max(total_est_cpu, 1); - e = skew; -*/ - -/* newpriority += skew; */ 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_jail_sched_shares, + total_cpu_sched_shares, np, newpriority); } kg->kg_user_pri = newpriority;