adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 03:36:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

sched: optimize calc_delta_mine()

Browse source 
Joel noticed that the !lw->inv_weight contition isn't unlikely anymore so
remove the unlikely annotation. Also, remove the two div64_u64() inv_weight
calculations, which makes them rely on the calc_delta_mine() path as well.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
CC: Joel Schopp <jschopp@austin.ibm.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2008-05-05 23:56:17 +02:00 committed by Ingo Molnar
parent a992241de6
commit e05510d01a
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
kernel/sched.c
View file

@ -1438,8 +1438,8 @@ calc_delta_mine(unsigned long delta_exec, unsigned long weight,
{ {
u64 tmp; u64 tmp;
if (unlikely(!lw->inv_weight)) if (!lw->inv_weight)
lw->inv_weight = (WMULT_CONST-lw->weight/2) / (lw->weight+1); lw->inv_weight = 1 + (WMULT_CONST-lw->weight/2)/(lw->weight+1);
tmp = (u64)delta_exec * weight; tmp = (u64)delta_exec * weight;
/* /*
@ -8025,7 +8025,7 @@ static void init_tg_cfs_entry(struct task_group *tg, struct cfs_rq *cfs_rq,
se->my_q = cfs_rq; se->my_q = cfs_rq;
se->load.weight = tg->shares; se->load.weight = tg->shares;
se->load.inv_weight = div64_u64(1ULL<<32, se->load.weight); se->load.inv_weight = 0;
se->parent = parent; se->parent = parent;
} }
#endif #endif
@ -8692,7 +8692,7 @@ static void __set_se_shares(struct sched_entity *se, unsigned long shares)
dequeue_entity(cfs_rq, se, 0); dequeue_entity(cfs_rq, se, 0);
se->load.weight = shares; se->load.weight = shares;
se->load.inv_weight = div64_u64((1ULL<<32), shares); se->load.inv_weight = 0;
if (on_rq) if (on_rq)
enqueue_entity(cfs_rq, se, 0); enqueue_entity(cfs_rq, se, 0);