From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752749AbbGODEw (ORCPT ); Tue, 14 Jul 2015 23:04:52 -0400 Received: from e36.co.us.ibm.com ([32.97.110.154]:42859 "EHLO e36.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752054AbbGODDJ (ORCPT ); Tue, 14 Jul 2015 23:03:09 -0400 X-Helo: d03dlp01.boulder.ibm.com X-MailFrom: sukadev@linux.vnet.ibm.com X-RcptTo: sparclinux@vger.kernel.org From: Sukadev Bhattiprolu To: Peter Zijlstra , Ingo Molnar , Arnaldo Carvalho de Melo , Michael Ellerman Cc: , linuxppc-dev@lists.ozlabs.org, linux-s390@vger.kernel.org, sparclinux@vger.kernel.org Subject: [PATCH v3 5/8] perf: Split perf_event_read_value() Date: Tue, 14 Jul 2015 20:01:52 -0700 Message-Id: <1436929315-28520-6-git-send-email-sukadev@linux.vnet.ibm.com> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1436929315-28520-1-git-send-email-sukadev@linux.vnet.ibm.com> References: <1436929315-28520-1-git-send-email-sukadev@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15071503-0021-0000-0000-00000E66C8CE Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Move the part of perf_event_read_value() that computes the event counts and event times into a new function, perf_event_compute(). This would allow us to call perf_event_compute() independently. Signed-off-by: Sukadev Bhattiprolu 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 | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/kernel/events/core.c b/kernel/events/core.c index 44fb89d..b1e9a42 100644 --- a/kernel/events/core.c +++ b/kernel/events/core.c @@ -3704,6 +3704,29 @@ static int perf_release(struct inode *inode, struct file *file) return 0; } +static u64 perf_event_compute(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); + + 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 +3765,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 +3773,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); + total = perf_event_compute(event, enabled, running); - *enabled += event->total_time_enabled + - atomic64_read(&event->child_total_time_enabled); - *running += event->total_time_running + - atomic64_read(&event->child_total_time_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