Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754529AbaLHGvw (ORCPT ); Mon, 8 Dec 2014 01:51:52 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34780 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754133AbaLHGvu (ORCPT ); Mon, 8 Dec 2014 01:51:50 -0500 Date: Sun, 7 Dec 2014 22:51:31 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: linux-kernel@vger.kernel.org, fweisbec@gmail.com, matt.fleming@intel.com, dsahern@gmail.com, cjashfor@linux.vnet.ibm.com, hpa@zytor.com, ak@linux.intel.com, paulus@samba.org, tglx@linutronix.de, acme@redhat.com, eranian@google.com, jolsa@kernel.org, namhyung@kernel.org, a.p.zijlstra@chello.nl, mingo@kernel.org Reply-To: mingo@kernel.org, a.p.zijlstra@chello.nl, namhyung@kernel.org, eranian@google.com, jolsa@kernel.org, acme@redhat.com, paulus@samba.org, tglx@linutronix.de, ak@linux.intel.com, hpa@zytor.com, cjashfor@linux.vnet.ibm.com, dsahern@gmail.com, matt.fleming@intel.com, fweisbec@gmail.com, linux-kernel@vger.kernel.org In-Reply-To: <1416562275-12404-5-git-send-email-jolsa@kernel.org> References: <1416562275-12404-5-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Use perf_evsel__read_cb in read_counter Git-Commit-ID: 060c4f9c8cc871a96dfacdc9306101e8b9195805 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: 060c4f9c8cc871a96dfacdc9306101e8b9195805 Gitweb: http://git.kernel.org/tip/060c4f9c8cc871a96dfacdc9306101e8b9195805 Author: Jiri Olsa AuthorDate: Fri, 21 Nov 2014 10:31:08 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 1 Dec 2014 20:00:30 -0300 perf stat: Use perf_evsel__read_cb in read_counter Replacing __perf_evsel__read_on_cpu function with perf_evsel__read_cb function. The read_cb callback will be used later for global aggregation counter values as well. Signed-off-by: Jiri Olsa Cc: Andi Kleen Cc: Corey Ashford Cc: David Ahern Cc: Frederic Weisbecker Cc: Ingo Molnar Cc: Matt Fleming Cc: Namhyung Kim Cc: Paul Mackerras Cc: Peter Zijlstra Cc: Stephane Eranian Link: http://lkml.kernel.org/r/1416562275-12404-5-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 27 +++++++++++++++++++++------ 1 file changed, 21 insertions(+), 6 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 055ce92..9cc0db1 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -388,6 +388,26 @@ static void update_shadow_stats(struct perf_evsel *counter, u64 *count) update_stats(&runtime_itlb_cache_stats[0], count[0]); } +static int read_cb(struct perf_evsel *evsel, int cpu, int thread __maybe_unused, + struct perf_counts_values *count) +{ + switch (aggr_mode) { + case AGGR_CORE: + case AGGR_SOCKET: + case AGGR_NONE: + perf_evsel__compute_deltas(evsel, cpu, count); + perf_counts_values__scale(count, scale, NULL); + evsel->counts->cpu[cpu] = *count; + update_shadow_stats(evsel, count->values); + break; + case AGGR_GLOBAL: + default: + break; + } + + return 0; +} + /* * Read out the results of a single counter: * aggregate counts across CPUs in system-wide mode @@ -424,16 +444,11 @@ static int read_counter_aggr(struct perf_evsel *counter) */ static int read_counter(struct perf_evsel *counter) { - u64 *count; int cpu; for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { - if (__perf_evsel__read_on_cpu(counter, cpu, 0, scale) < 0) + if (perf_evsel__read_cb(counter, cpu, 0, read_cb)) return -1; - - count = counter->counts->cpu[cpu].values; - - update_shadow_stats(counter, count); } return 0; -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/