iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

sched: Clean up the load_idx selection in select_task_rq_fair

Browse Source 
Clean up the code a little.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
LKML-Reference: <new-submission>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-09-16 13:46:59 +02:00 committed by Ingo Molnar
parent 3b64089422
commit 5158f4e442
1 changed files with 8 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
kernel/sched_fair.c
View File

@ -1248,26 +1248,11 @@ static int wake_affine(struct sched_domain *sd, struct task_struct *p, int sync)
*/ */
static struct sched_group * static struct sched_group *
find_idlest_group(struct sched_domain *sd, struct task_struct *p, find_idlest_group(struct sched_domain *sd, struct task_struct *p,
int this_cpu, int flag) int this_cpu, int load_idx)
{ {
struct sched_group *idlest = NULL, *this = NULL, *group = sd->groups; struct sched_group *idlest = NULL, *this = NULL, *group = sd->groups;
unsigned long min_load = ULONG_MAX, this_load = 0; unsigned long min_load = ULONG_MAX, this_load = 0;
int imbalance = 100 + (sd->imbalance_pct-100)/2; int imbalance = 100 + (sd->imbalance_pct-100)/2;
int load_idx = 0;
switch (flag) {
case SD_BALANCE_FORK:
case SD_BALANCE_EXEC:
load_idx = sd->forkexec_idx;
break;
case SD_BALANCE_WAKE:
load_idx = sd->wake_idx;
break;
default:
break;
}
do { do {
unsigned long load, avg_load; unsigned long load, avg_load;
@ -1346,14 +1331,14 @@ find_idlest_cpu(struct sched_group *group, struct task_struct *p, int this_cpu)
* *
* preempt must be disabled. * preempt must be disabled.
*/ */
static int select_task_rq_fair(struct task_struct *p, int sd_flag, int flags) static int select_task_rq_fair(struct task_struct *p, int sd_flag, int wake_flags)
{ {
struct sched_domain *tmp, *shares = NULL, *sd = NULL; struct sched_domain *tmp, *shares = NULL, *sd = NULL;
int cpu = smp_processor_id(); int cpu = smp_processor_id();
int prev_cpu = task_cpu(p); int prev_cpu = task_cpu(p);
int new_cpu = cpu; int new_cpu = cpu;
int want_affine = 0; int want_affine = 0;
int sync = flags & WF_SYNC; int sync = wake_flags & WF_SYNC;
if (sd_flag & SD_BALANCE_WAKE) { if (sd_flag & SD_BALANCE_WAKE) {
if (sched_feat(AFFINE_WAKEUPS)) if (sched_feat(AFFINE_WAKEUPS))
@ -1413,6 +1398,7 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int flags)
update_shares(sd); update_shares(sd);
while (sd) { while (sd) {
int load_idx = sd->forkexec_idx;
struct sched_group *group; struct sched_group *group;
int weight; int weight;
@ -1421,7 +1407,10 @@ static int select_task_rq_fair(struct task_struct *p, int sd_flag, int flags)
continue; continue;
} }
group = find_idlest_group(sd, p, cpu, sd_flag); if (sd_flag & SD_BALANCE_WAKE)
load_idx = sd->wake_idx;
group = find_idlest_group(sd, p, cpu, load_idx);
if (!group) { if (!group) {
sd = sd->child; sd = sd->child;
continue; continue;