Skip to contentSkip to conversation

perf: Add perf_event::child_count

tip:perf/core tip-bot for Peter Zijlstra 1 participant 1 message Jun 9, 2010 perf events

lore
Share & tools
lore
#0 lore raw
Commit-ID:  a6e6dea68c18f705957573ee5596097c7e82d0e5
Gitweb:     http://git.kernel.org/tip/a6e6dea68c18f705957573ee5596097c7e82d0e5
Author:     Peter Zijlstra <[email protected]>
AuthorDate: Fri, 21 May 2010 14:27:58 +0200
Committer:  Ingo Molnar <[email protected]>
CommitDate: Wed, 9 Jun 2010 11:12:37 +0200

perf: Add perf_event::child_count

Only child counters adding back their values into the parent counter are responsible for cross-cpu updates to event->count.

So if we pull that out into a new child_count variable, we get an event->count that is only modified locally.

Cc Arnaldo Carvalho de Melo <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Steven Rostedt <[email protected]>

LKML-Reference: <new-submission>

---
 include/linux/perf_event.h |    1 +
 kernel/perf_event.c        |    4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)
include/linux/perf_event.h +1 -0
index 441992a..f34dab9 100644
@@ -671,6 +671,7 @@ struct perf_event {
 	enum perf_event_active_state	state;
 	unsigned int			attach_state;
 	atomic64_t			count;
+	atomic64_t			child_count;
 
 	/*
 	 * These are the total time in nanoseconds that the event
kernel/perf_event.c +2 -2
index ab4c0ff..a395fda 100644
@@ -1738,7 +1738,7 @@ static void __perf_event_read(void *info)
 
 static inline u64 perf_event_count(struct perf_event *event)
 {
-	return atomic64_read(&event->count);
+	return atomic64_read(&event->count) + atomic64_read(&event->child_count);
 }
 
 static u64 perf_event_read(struct perf_event *event)
@@ -5379,7 +5379,7 @@ static void sync_child_event(struct perf_event *child_event,
 	/*
 	 * Add back the child's count to the parent's count:
 	 */
-	atomic64_add(child_val, &parent_event->count);
+	atomic64_add(child_val, &parent_event->child_count);
 	atomic64_add(child_event->total_time_enabled,
 		     &parent_event->child_total_time_enabled);
 	atomic64_add(child_event->total_time_running,