mirror of
https://github.com/FEX-Emu/linux.git
synced 2024-12-21 00:42:16 +00:00
sched: Change cfs_rq load avg to unsigned long
Since the 'u64 runnable_load_avg, blocked_load_avg' in cfs_rq struct are smaller than 'unsigned long' cfs_rq->load.weight. We don't need u64 vaiables to describe them. unsigned long is more efficient and convenience. Signed-off-by: Alex Shi <alex.shi@intel.com> Reviewed-by: Paul Turner <pjt@google.com> Tested-by: Vincent Guittot <vincent.guittot@linaro.org> Signed-off-by: Peter Zijlstra <peterz@infradead.org> Link: http://lkml.kernel.org/r/1371694737-29336-10-git-send-email-alex.shi@intel.com Signed-off-by: Ingo Molnar <mingo@kernel.org>
This commit is contained in:
parent
a003a25b22
commit
72a4cf20cb
@ -211,9 +211,9 @@ void print_cfs_rq(struct seq_file *m, int cpu, struct cfs_rq *cfs_rq)
|
||||
SEQ_printf(m, " .%-30s: %ld\n", "load", cfs_rq->load.weight);
|
||||
#ifdef CONFIG_FAIR_GROUP_SCHED
|
||||
#ifdef CONFIG_SMP
|
||||
SEQ_printf(m, " .%-30s: %lld\n", "runnable_load_avg",
|
||||
SEQ_printf(m, " .%-30s: %ld\n", "runnable_load_avg",
|
||||
cfs_rq->runnable_load_avg);
|
||||
SEQ_printf(m, " .%-30s: %lld\n", "blocked_load_avg",
|
||||
SEQ_printf(m, " .%-30s: %ld\n", "blocked_load_avg",
|
||||
cfs_rq->blocked_load_avg);
|
||||
SEQ_printf(m, " .%-30s: %lld\n", "tg_load_avg",
|
||||
(unsigned long long)atomic64_read(&cfs_rq->tg->load_avg));
|
||||
|
@ -4181,12 +4181,9 @@ static int tg_load_down(struct task_group *tg, void *data)
|
||||
if (!tg->parent) {
|
||||
load = cpu_rq(cpu)->avg.load_avg_contrib;
|
||||
} else {
|
||||
unsigned long tmp_rla;
|
||||
tmp_rla = tg->parent->cfs_rq[cpu]->runnable_load_avg + 1;
|
||||
|
||||
load = tg->parent->cfs_rq[cpu]->h_load;
|
||||
load *= tg->se[cpu]->avg.load_avg_contrib;
|
||||
load /= tmp_rla;
|
||||
load = div64_ul(load * tg->se[cpu]->avg.load_avg_contrib,
|
||||
tg->parent->cfs_rq[cpu]->runnable_load_avg + 1);
|
||||
}
|
||||
|
||||
tg->cfs_rq[cpu]->h_load = load;
|
||||
|
@ -277,7 +277,7 @@ struct cfs_rq {
|
||||
* This allows for the description of both thread and group usage (in
|
||||
* the FAIR_GROUP_SCHED case).
|
||||
*/
|
||||
u64 runnable_load_avg, blocked_load_avg;
|
||||
unsigned long runnable_load_avg, blocked_load_avg;
|
||||
atomic64_t decay_counter, removed_load;
|
||||
u64 last_decay;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user