Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932387AbWCMJPF (ORCPT ); Mon, 13 Mar 2006 04:15:05 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S932385AbWCMJPF (ORCPT ); Mon, 13 Mar 2006 04:15:05 -0500 Received: from mail09.syd.optusnet.com.au ([211.29.132.190]:35462 "EHLO mail09.syd.optusnet.com.au") by vger.kernel.org with ESMTP id S932382AbWCMJPC (ORCPT ); Mon, 13 Mar 2006 04:15:02 -0500 From: Con Kolivas To: Ingo Molnar Subject: Re: [PATCH][2/4] sched: add discrete weighted cpu load function Date: Mon, 13 Mar 2006 20:14:44 +1100 User-Agent: KMail/1.9.1 Cc: linux list , Andrew Morton , Peter Williams , ck list References: <200603131906.11739.kernel@kolivas.org> <20060313090658.GB5780@elte.hu> In-Reply-To: <20060313090658.GB5780@elte.hu> MIME-Version: 1.0 Content-Type: text/plain; charset="iso-8859-1" Content-Transfer-Encoding: 7bit Content-Disposition: inline Message-Id: <200603132014.45302.kernel@kolivas.org> Sender: linux-kernel-owner@vger.kernel.org X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 2758 Lines: 80 On Monday 13 March 2006 20:06, Ingo Molnar wrote: > * Con Kolivas wrote: > > +/* Used instead of source_load when we know the type == 0 */ > > +unsigned long weighted_cpuload(const int cpu) > > +{ > > + return (cpu_rq(cpu)->raw_weighted_load); > > no braces in return please. Looks good to me otherwise. > > Acked-by: Ingo Molnar Thanks. Respin with that one change below. Cheers, Con --- When the type of weighting is known to be zero we can use a simpler version of source_load with a weighted_cpuload() function. Export that function to allow relative weighted cpu load to be used by other subsystems if desired. Signed-off-by: Con Kolivas --- include/linux/sched.h | 1 + kernel/sched.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) Index: linux-2.6.16-rc6-mm1/include/linux/sched.h =================================================================== --- linux-2.6.16-rc6-mm1.orig/include/linux/sched.h 2006-03-13 18:29:42.000000000 +1100 +++ linux-2.6.16-rc6-mm1/include/linux/sched.h 2006-03-13 20:11:25.000000000 +1100 @@ -102,6 +102,7 @@ extern int nr_processes(void); extern unsigned long nr_running(void); extern unsigned long nr_uninterruptible(void); extern unsigned long nr_iowait(void); +extern unsigned long weighted_cpuload(const int cpu); #include #include Index: linux-2.6.16-rc6-mm1/kernel/sched.c =================================================================== --- linux-2.6.16-rc6-mm1.orig/kernel/sched.c 2006-03-13 18:29:42.000000000 +1100 +++ linux-2.6.16-rc6-mm1/kernel/sched.c 2006-03-13 20:12:15.000000000 +1100 @@ -914,6 +914,12 @@ inline int task_curr(const task_t *p) return cpu_curr(task_cpu(p)) == p; } +/* Used instead of source_load when we know the type == 0 */ +unsigned long weighted_cpuload(const int cpu) +{ + return cpu_rq(cpu)->raw_weighted_load; +} + #ifdef CONFIG_SMP typedef struct { struct list_head list; @@ -1114,7 +1120,7 @@ find_idlest_cpu(struct sched_group *grou cpus_and(tmp, group->cpumask, p->cpus_allowed); for_each_cpu_mask(i, tmp) { - load = source_load(i, 0); + load = weighted_cpuload(i); if (load < min_load || (load == min_load && i == this_cpu)) { min_load = load; @@ -2186,7 +2192,7 @@ static runqueue_t *find_busiest_queue(st int i; for_each_cpu_mask(i, group->cpumask) { - load = source_load(i, 0); + load = weighted_cpuload(i); if (load > max_load) { max_load = load; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/