Move the part of perf_event_read_value() that aggregates the event
counts and event times into a new function, perf_event_aggregate().
This would allow us to call perf_event_aggregate() independently.
Signed-off-by: Sukadev Bhattiprolu <suka...@linux.vnet.ibm.com>
---
Changelog[v4]
[Peter Zijlstra] Add missing lockdep_assert(). Rename
perf_event_compute() (to perf_event_aggregate()).
Changelog[v3]
Rather than move perf_event_read() into callers and then
rename, just move the computations into a separate function
(redesign to address comment from Peter Zijlstra).
---
kernel/events/core.c | 39 ++++++++++++++++++++++++++-------------
1 file changed, 26 insertions(+), 13 deletions(-)
diff --git a/kernel/events/core.c b/kernel/events/core.c
index f9ca8cb..97619ed 100644
--- a/kernel/events/core.c
+++ b/kernel/events/core.c
@@ -3704,6 +3704,31 @@ static int perf_release(struct inode *inode, struct file
*file)
return 0;
}
+static u64 perf_event_aggregate(struct perf_event *event, u64 *enabled,
+ u64 *running)
+{
+ struct perf_event *child;
+ u64 total;
+
+ total = perf_event_count(event);
+
+ *enabled += event->total_time_enabled +
+ atomic64_read(&event->child_total_time_enabled);
+ *running += event->total_time_running +
+ atomic64_read(&event->child_total_time_running);
+
+ lockdep_assert_held(&event->child_mutex);
+
+ list_for_each_entry(child, &event->child_list, child_list) {
+ perf_event_read(child);
+ total += perf_event_count(child);
+ *enabled += child->total_time_enabled;
+ *running += child->total_time_running;
+ }
+
+ return total;
+}
+
/*
* Remove all orphanes events from the context.
*/
@@ -3742,7 +3767,6 @@ static void orphans_remove_work(struct work_struct *work)
u64 perf_event_read_value(struct perf_event *event, u64 *enabled, u64 *running)
{
- struct perf_event *child;
u64 total = 0;
*enabled = 0;
@@ -3751,19 +3775,8 @@ u64 perf_event_read_value(struct perf_event *event, u64
*enabled, u64 *running)
mutex_lock(&event->child_mutex);
perf_event_read(event);
- total += perf_event_count(event);
-
- *enabled += event->total_time_enabled +
- atomic64_read(&event->child_total_time_enabled);
- *running += event->total_time_running +
- atomic64_read(&event->child_total_time_running);
+ total = perf_event_aggregate(event, enabled, running);
- list_for_each_entry(child, &event->child_list, child_list) {
- perf_event_read(child);
- total += perf_event_count(child);
- *enabled += child->total_time_enabled;
- *running += child->total_time_running;
- }
mutex_unlock(&event->child_mutex);
return total;
--
1.7.9.5
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
