aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/perf_event.h
diff options
context:
space:
mode:
authorPeter Zijlstra <a.p.zijlstra@chello.nl>2010-05-06 11:31:38 -0400
committerIngo Molnar <mingo@elte.hu>2010-05-07 05:30:17 -0400
commit4fd38e4595e2f6c9d27732c042a0e16b2753049c (patch)
treebb18024a183691b81062f97fbc3de4938a1d6086 /include/linux/perf_event.h
parent722154e4cacf015161efe60009ae9be23d492296 (diff)
perf: Fix exit() vs PERF_FORMAT_GROUP
Both Stephane and Corey reported that PERF_FORMAT_GROUP didn't work as expected if the task the counters were attached to quit before the read() call. The cause is that we unconditionally destroy the grouping when we remove counters from their context. Fix this by only doing this when we free the counter itself. Reported-by: Corey Ashford <cjashfor@linux.vnet.ibm.com> Reported-by: Stephane Eranian <eranian@google.com> Signed-off-by: Peter Zijlstra <a.p.zijlstra@chello.nl> LKML-Reference: <1273160566.5605.404.camel@twins> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'include/linux/perf_event.h')
-rw-r--r--include/linux/perf_event.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/perf_event.h b/include/linux/perf_event.h
index c8e375440403..bf8f3c003297 100644
--- a/include/linux/perf_event.h
+++ b/include/linux/perf_event.h
@@ -522,6 +522,7 @@ struct pmu {
522 * enum perf_event_active_state - the states of a event 522 * enum perf_event_active_state - the states of a event
523 */ 523 */
524enum perf_event_active_state { 524enum perf_event_active_state {
525 PERF_EVENT_STATE_FREE = -3,
525 PERF_EVENT_STATE_ERROR = -2, 526 PERF_EVENT_STATE_ERROR = -2,
526 PERF_EVENT_STATE_OFF = -1, 527 PERF_EVENT_STATE_OFF = -1,
527 PERF_EVENT_STATE_INACTIVE = 0, 528 PERF_EVENT_STATE_INACTIVE = 0,