Commit 2e2af50b authored Nov 23, 2009 by Peter Zijlstra Committed by Ingo Molnar Nov 23, 2009

perf_events: Disable events when we detach them

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>

parent 6c2bfcbe

kernel/perf_event.c

+2 −0

Original line number	Original line	Diff line number	Diff line
	@@ -294,6 +294,8 @@ list_del_event(struct perf_event event, struct perf_event_context ctx)
	if (event->group_leader != event)		if (event->group_leader != event)
	event->group_leader->nr_siblings--;		event->group_leader->nr_siblings--;

			event->state = PERF_EVENT_STATE_OFF;

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