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

perf_counter: Optimize sched in/out of counters

Avoid a function call for !group counters by directly calling the counter
function.

[ Impact: micro-optimize the code ]
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Marcelo Tosatti <mtosatti@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <20090520102553.511933670@chello.nl>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b986d7ec
...@@ -826,8 +826,12 @@ void __perf_counter_sched_out(struct perf_counter_context *ctx, ...@@ -826,8 +826,12 @@ void __perf_counter_sched_out(struct perf_counter_context *ctx,
perf_disable(); perf_disable();
if (ctx->nr_active) { if (ctx->nr_active) {
list_for_each_entry(counter, &ctx->counter_list, list_entry) list_for_each_entry(counter, &ctx->counter_list, list_entry) {
group_sched_out(counter, cpuctx, ctx); if (counter != counter->group_leader)
counter_sched_out(counter, cpuctx, ctx);
else
group_sched_out(counter, cpuctx, ctx);
}
} }
perf_enable(); perf_enable();
out: out:
...@@ -903,8 +907,12 @@ __perf_counter_sched_in(struct perf_counter_context *ctx, ...@@ -903,8 +907,12 @@ __perf_counter_sched_in(struct perf_counter_context *ctx,
if (counter->cpu != -1 && counter->cpu != cpu) if (counter->cpu != -1 && counter->cpu != cpu)
continue; continue;
if (group_can_go_on(counter, cpuctx, 1)) if (counter != counter->group_leader)
group_sched_in(counter, cpuctx, ctx, cpu); counter_sched_in(counter, cpuctx, ctx, cpu);
else {
if (group_can_go_on(counter, cpuctx, 1))
group_sched_in(counter, cpuctx, ctx, cpu);
}
/* /*
* If this pinned group hasn't been scheduled, * If this pinned group hasn't been scheduled,
...@@ -932,9 +940,14 @@ __perf_counter_sched_in(struct perf_counter_context *ctx, ...@@ -932,9 +940,14 @@ __perf_counter_sched_in(struct perf_counter_context *ctx,
if (counter->cpu != -1 && counter->cpu != cpu) if (counter->cpu != -1 && counter->cpu != cpu)
continue; continue;
if (group_can_go_on(counter, cpuctx, can_add_hw)) { if (counter != counter->group_leader) {
if (group_sched_in(counter, cpuctx, ctx, cpu)) if (counter_sched_in(counter, cpuctx, ctx, cpu))
can_add_hw = 0; can_add_hw = 0;
} else {
if (group_can_go_on(counter, cpuctx, can_add_hw)) {
if (group_sched_in(counter, cpuctx, ctx, cpu))
can_add_hw = 0;
}
} }
} }
perf_enable(); perf_enable();
......
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