From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753889AbdL1P1Z (ORCPT ); Thu, 28 Dec 2017 10:27:25 -0500 Received: from terminus.zytor.com ([65.50.211.136]:42861 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753463AbdL1P1X (ORCPT ); Thu, 28 Dec 2017 10:27:23 -0500 Date: Thu, 28 Dec 2017 07:25:01 -0800 From: tip-bot for Jin Yao Message-ID: Cc: linux-kernel@vger.kernel.org, mingo@kernel.org, kan.liang@intel.com, jolsa@kernel.org, yao.jin@linux.intel.com, acme@redhat.com, peterz@infradead.org, hpa@zytor.com, alexander.shishkin@linux.intel.com, ak@linux.intel.com, tglx@linutronix.de Reply-To: hpa@zytor.com, peterz@infradead.org, acme@redhat.com, jolsa@kernel.org, yao.jin@linux.intel.com, kan.liang@intel.com, mingo@kernel.org, linux-kernel@vger.kernel.org, tglx@linutronix.de, ak@linux.intel.com, alexander.shishkin@linux.intel.com In-Reply-To: <1512482591-4646-9-git-send-email-yao.jin@linux.intel.com> References: <1512482591-4646-9-git-send-email-yao.jin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf stat: Update or print per-thread stats Git-Commit-ID: 14e72a21c783654ca7b6c897b6d6508c1abccd7d 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: 14e72a21c783654ca7b6c897b6d6508c1abccd7d Gitweb: https://git.kernel.org/tip/14e72a21c783654ca7b6c897b6d6508c1abccd7d Author: Jin Yao AuthorDate: Tue, 5 Dec 2017 22:03:08 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 27 Dec 2017 12:15:46 -0300 perf stat: Update or print per-thread stats If the stats pointer in stat_config structure is not null, it will update the per-thread stats or print the per-thread stats on this buffer. Signed-off-by: Jin Yao Acked-by: Jiri Olsa Cc: Alexander Shishkin Cc: Andi Kleen Cc: Kan Liang Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1512482591-4646-9-git-send-email-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-stat.c | 9 +++++++-- tools/perf/util/stat.c | 11 ++++++++--- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/tools/perf/builtin-stat.c b/tools/perf/builtin-stat.c index 4c492ac..f4129a5 100644 --- a/tools/perf/builtin-stat.c +++ b/tools/perf/builtin-stat.c @@ -1372,8 +1372,13 @@ static void print_aggr_thread(struct perf_evsel *counter, char *prefix) fprintf(output, "%s", prefix); uval = val * counter->scale; - printout(thread, 0, counter, uval, prefix, run, ena, 1.0, - &rt_stat); + + if (stat_config.stats) + printout(thread, 0, counter, uval, prefix, run, ena, + 1.0, &stat_config.stats[thread]); + else + printout(thread, 0, counter, uval, prefix, run, ena, + 1.0, &rt_stat); fputc('\n', output); } } diff --git a/tools/perf/util/stat.c b/tools/perf/util/stat.c index 78abfd4..32235657 100644 --- a/tools/perf/util/stat.c +++ b/tools/perf/util/stat.c @@ -280,9 +280,14 @@ process_counter_values(struct perf_stat_config *config, struct perf_evsel *evsel if (config->aggr_mode == AGGR_NONE) perf_stat__update_shadow_stats(evsel, count->val, cpu, &rt_stat); - if (config->aggr_mode == AGGR_THREAD) - perf_stat__update_shadow_stats(evsel, count->val, 0, - &rt_stat); + if (config->aggr_mode == AGGR_THREAD) { + if (config->stats) + perf_stat__update_shadow_stats(evsel, + count->val, 0, &config->stats[thread]); + else + perf_stat__update_shadow_stats(evsel, + count->val, 0, &rt_stat); + } break; case AGGR_GLOBAL: aggr->val += count->val;