Commit ced8aa16 authored by Peter Zijlstra's avatar Peter Zijlstra Committed by Ingo Molnar

sched: fix calc_delta_asym, #2

Ok, so why are we in this mess, it was:

  1/w

but now we mixed that rw in the mix like:

 rw/w

rw being \Sum w suggests: fiddling w, we should also fiddle rw, humm?
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Srivatsa Vaddagiri <vatsa@linux.vnet.ibm.com>
Cc: Mike Galbraith <efault@gmx.de>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent c9c294a6
...@@ -429,6 +429,7 @@ calc_delta_asym(unsigned long delta, struct sched_entity *se) ...@@ -429,6 +429,7 @@ calc_delta_asym(unsigned long delta, struct sched_entity *se)
for_each_sched_entity(se) { for_each_sched_entity(se) {
struct load_weight *se_lw = &se->load; struct load_weight *se_lw = &se->load;
unsigned long rw = cfs_rq_of(se)->load.weight;
#ifdef CONFIG_FAIR_SCHED_GROUP #ifdef CONFIG_FAIR_SCHED_GROUP
struct cfs_rq *cfs_rq = se->my_q; struct cfs_rq *cfs_rq = se->my_q;
...@@ -450,14 +451,16 @@ calc_delta_asym(unsigned long delta, struct sched_entity *se) ...@@ -450,14 +451,16 @@ calc_delta_asym(unsigned long delta, struct sched_entity *se)
lw.inv_weight = 0; lw.inv_weight = 0;
se_lw = &lw; se_lw = &lw;
rw += lw.weight - se->load.weight;
} else } else
#endif #endif
if (se->load.weight < NICE_0_LOAD) if (se->load.weight < NICE_0_LOAD) {
se_lw = &lw; se_lw = &lw;
rw += NICE_0_LOAD - se->load.weight;
}
delta = calc_delta_mine(delta, delta = calc_delta_mine(delta, rw, se_lw);
cfs_rq_of(se)->load.weight, se_lw);
} }
return delta; return delta;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment