perf_counter: Fix PERF_COUNTER_CONTEXT_SWITCHES for cpu counters

Ingo noticed that cpu counters had 0 context switches, even though
there was plenty scheduling on the cpu.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Corey Ashford <cjashfor@linux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: John Kacur <jkacur@redhat.com>
LKML-Reference: <20090525124600.419025548@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
This commit is contained in:
Peter Zijlstra 2009-05-25 14:45:28 +02:00 committed by Ingo Molnar
parent 6ab423e0ea
commit 10989fb245

View file

@ -924,14 +924,13 @@ void perf_counter_task_sched_out(struct task_struct *task,
struct perf_counter_context *next_ctx; struct perf_counter_context *next_ctx;
struct pt_regs *regs; struct pt_regs *regs;
regs = task_pt_regs(task);
perf_swcounter_event(PERF_COUNT_CONTEXT_SWITCHES, 1, 1, regs, 0);
if (likely(!ctx || !cpuctx->task_ctx)) if (likely(!ctx || !cpuctx->task_ctx))
return; return;
update_context_time(ctx); update_context_time(ctx);
regs = task_pt_regs(task);
perf_swcounter_event(PERF_COUNT_CONTEXT_SWITCHES, 1, 1, regs, 0);
next_ctx = next->perf_counter_ctxp; next_ctx = next->perf_counter_ctxp;
if (next_ctx && context_equiv(ctx, next_ctx)) { if (next_ctx && context_equiv(ctx, next_ctx)) {
task->perf_counter_ctxp = next_ctx; task->perf_counter_ctxp = next_ctx;