Skip to content

Commit

Permalink
perf_events: Disable events when we detach them
Browse files Browse the repository at this point in the history
If we leave the event in STATE_INACTIVE, any read of the event
after the detach will increase the running count but not the
enabled count and cause funny scaling artefacts.

Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
LKML-Reference: <20091123103819.689055515@chello.nl>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
  • Loading branch information
Peter Zijlstra authored and Ingo Molnar committed Nov 23, 2009
1 parent 6c2bfcb commit 2e2af50
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions kernel/perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,8 @@ list_del_event(struct perf_event *event, struct perf_event_context *ctx)
if (event->group_leader != event)
event->group_leader->nr_siblings--;

event->state = PERF_EVENT_STATE_OFF;

/*
* If this was a group event with sibling events then
* upgrade the siblings to singleton events by adding them
Expand Down

0 comments on commit 2e2af50

Please sign in to comment.