From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S935887AbcKOKtZ (ORCPT ); Tue, 15 Nov 2016 05:49:25 -0500 Received: from terminus.zytor.com ([198.137.202.10]:51250 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932280AbcKOKtV (ORCPT ); Tue, 15 Nov 2016 05:49:21 -0500 Date: Tue, 15 Nov 2016 02:49:11 -0800 From: tip-bot for Jin Yao Message-ID: Cc: linux-kernel@vger.kernel.org, jolsa@kernel.org, hpa@zytor.com, yao.jin@linux.intel.com, ak@linux.intel.com, acme@redhat.com, kan.liang@intel.com, mingo@kernel.org, tglx@linutronix.de Reply-To: kan.liang@intel.com, ak@linux.intel.com, acme@redhat.com, tglx@linutronix.de, mingo@kernel.org, hpa@zytor.com, jolsa@kernel.org, linux-kernel@vger.kernel.org, yao.jin@linux.intel.com In-Reply-To: <1477876794-30749-6-git-send-email-yao.jin@linux.intel.com> References: <1477876794-30749-6-git-send-email-yao.jin@linux.intel.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf report: Show branch info in callchain entry for browser mode Git-Commit-ID: fef51ecd1056b5e090c9fb73e0833bd751389572 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: fef51ecd1056b5e090c9fb73e0833bd751389572 Gitweb: http://git.kernel.org/tip/fef51ecd1056b5e090c9fb73e0833bd751389572 Author: Jin Yao AuthorDate: Mon, 31 Oct 2016 09:19:53 +0800 Committer: Arnaldo Carvalho de Melo CommitDate: Mon, 14 Nov 2016 13:34:08 -0300 perf report: Show branch info in callchain entry for browser mode If the branch is 100% predicted then the "predicted" is hidden. Similarly, if there is no branch tsx abort, the "abort" is hidden. There is only cycles shown (cycle is supported on skylake platform, older platform would be 0). If no iterations, the "iterations" is hidden. Signed-off-by: Yao Jin Acked-by: Andi Kleen Cc: Jiri Olsa Cc: Kan Liang Cc: Linux-kernel@vger.kernel.org Cc: Yao Jin Link: http://lkml.kernel.org/r/1477876794-30749-6-git-send-email-yao.jin@linux.intel.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/ui/browsers/hists.c | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/perf/ui/browsers/hists.c b/tools/perf/ui/browsers/hists.c index 84f5dd2..66676cb 100644 --- a/tools/perf/ui/browsers/hists.c +++ b/tools/perf/ui/browsers/hists.c @@ -738,6 +738,7 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser, struct callchain_print_arg *arg) { char bf[1024], *alloc_str; + char buf[64], *alloc_str2; const char *str; if (arg->row_offset != 0) { @@ -746,12 +747,26 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser, } alloc_str = NULL; + alloc_str2 = NULL; + str = callchain_list__sym_name(chain, bf, sizeof(bf), browser->show_dso); - if (need_percent) { - char buf[64]; + if (symbol_conf.show_branchflag_count) { + if (need_percent) + callchain_list_counts__printf_value(node, chain, NULL, + buf, sizeof(buf)); + else + callchain_list_counts__printf_value(NULL, chain, NULL, + buf, sizeof(buf)); + + if (asprintf(&alloc_str2, "%s%s", str, buf) < 0) + str = "Not enough memory!"; + else + str = alloc_str2; + } + if (need_percent) { callchain_node__scnprintf_value(node, buf, sizeof(buf), total); @@ -764,6 +779,7 @@ static int hist_browser__show_callchain_list(struct hist_browser *browser, print(browser, chain, str, offset, row, arg); free(alloc_str); + free(alloc_str2); return 1; }