Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754550AbaLHGwJ (ORCPT ); Mon, 8 Dec 2014 01:52:09 -0500 Received: from terminus.zytor.com ([198.137.202.10]:34803 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754084AbaLHGwH (ORCPT ); Mon, 8 Dec 2014 01:52:07 -0500 Date: Sun, 7 Dec 2014 22:51:47 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: jolsa@kernel.org, acme@redhat.com, namhyung@kernel.org, hpa@zytor.com, paulus@samba.org, ak@linux.intel.com, linux-kernel@vger.kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, matt.fleming@intel.com, dsahern@gmail.com, fweisbec@gmail.com, eranian@google.com, cjashfor@linux.vnet.ibm.com, mingo@kernel.org Reply-To: tglx@linutronix.de, a.p.zijlstra@chello.nl, ak@linux.intel.com, linux-kernel@vger.kernel.org, paulus@samba.org, hpa@zytor.com, namhyung@kernel.org, acme@redhat.com, jolsa@kernel.org, mingo@kernel.org, cjashfor@linux.vnet.ibm.com, eranian@google.com, fweisbec@gmail.com, dsahern@gmail.com, matt.fleming@intel.com In-Reply-To: <1416562275-12404-6-git-send-email-jolsa@kernel.org> References: <1416562275-12404-6-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Make read_counter work over the thread dimension Git-Commit-ID: 9bf1a52914c7e810091f7726790fc42242a2dafe 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: 9bf1a52914c7e810091f7726790fc42242a2dafe Gitweb: http://git.kernel.org/tip/9bf1a52914c7e810091f7726790fc42242a2dafe Author: Jiri Olsa AuthorDate: Fri, 21 Nov 2014 10:31:09 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 1 Dec 2014 20:00:30 -0300 perf stat: Make read_counter work over the thread dimension The read function will be used later for both aggr and cpu counters, so we need to make it work over threads 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-6-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 9cc0db1..2511d3a 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -444,11 +444,18 @@ static int read_counter_aggr(struct perf_evsel *counter) */ static int read_counter(struct perf_evsel *counter) { - int cpu; + int nthreads = thread_map__nr(evsel_list->threads); + int ncpus = perf_evsel__nr_cpus(counter); + int cpu, thread; - for (cpu = 0; cpu < perf_evsel__nr_cpus(counter); cpu++) { - if (perf_evsel__read_cb(counter, cpu, 0, read_cb)) - return -1; + if (counter->system_wide) + nthreads = 1; + + for (thread = 0; thread < nthreads; thread++) { + for (cpu = 0; cpu < ncpus; cpu++) { + if (perf_evsel__read_cb(counter, cpu, thread, read_cb)) + return -1; + } } 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/