Commit 1d5f003f authored by Gleb Natapov's avatar Gleb Natapov Committed by Ingo Molnar

perf: Do not set task_ctx pointer in cpuctx if there are no events in the context

Do not set task_ctx pointer during sched_in if there are no
events associated with the context.  Otherwise if during task
execution total number of events in the system will become zero
perf_event_context_sched_out() will not be called and cpuctx->task_ctx
will be left with a stale value.
Signed-off-by: default avatarGleb Natapov <gleb@redhat.com>
Signed-off-by: default avatarPeter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/20111023171033.GI17571@redhat.comSigned-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 57d1c0c0
...@@ -2173,6 +2173,7 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx, ...@@ -2173,6 +2173,7 @@ static void perf_event_context_sched_in(struct perf_event_context *ctx,
perf_event_sched_in(cpuctx, ctx, task); perf_event_sched_in(cpuctx, ctx, task);
if (ctx->nr_events)
cpuctx->task_ctx = ctx; cpuctx->task_ctx = ctx;
perf_pmu_enable(ctx->pmu); perf_pmu_enable(ctx->pmu);
......
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