From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752102AbdJYRWH (ORCPT ); Wed, 25 Oct 2017 13:22:07 -0400 Received: from terminus.zytor.com ([65.50.211.136]:54959 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751803AbdJYRWF (ORCPT ); Wed, 25 Oct 2017 13:22:05 -0400 Date: Wed, 25 Oct 2017 10:18:26 -0700 From: tip-bot for Milian Wolff Message-ID: Cc: yao.jin@linux.intel.com, hpa@zytor.com, milian.wolff@kdab.com, mingo@kernel.org, peterz@infradead.org, acme@redhat.com, linux-kernel@vger.kernel.org, tglx@linutronix.de, jolsa@redhat.com, dsahern@gmail.com, namhyung@kernel.org Reply-To: namhyung@kernel.org, dsahern@gmail.com, jolsa@redhat.com, tglx@linutronix.de, acme@redhat.com, linux-kernel@vger.kernel.org, peterz@infradead.org, mingo@kernel.org, milian.wolff@kdab.com, hpa@zytor.com, yao.jin@linux.intel.com In-Reply-To: <20171009203310.17362-8-milian.wolff@kdab.com> References: <20171009203310.17362-8-milian.wolff@kdab.com> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf callchain: Mark inlined frames in output by " (inlined)" suffix Git-Commit-ID: 8932f8071cae8a12dfd5f492247777ee176b0da4 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: 8932f8071cae8a12dfd5f492247777ee176b0da4 Gitweb: https://git.kernel.org/tip/8932f8071cae8a12dfd5f492247777ee176b0da4 Author: Milian Wolff AuthorDate: Mon, 9 Oct 2017 22:33:01 +0200 Committer: Arnaldo Carvalho de Melo CommitDate: Tue, 24 Oct 2017 09:59:56 -0300 perf callchain: Mark inlined frames in output by " (inlined)" suffix The original patch that introduced inline frame output in the various browsers used this suffix already. The new centralized approach that uses fake symbols for inlined frames was missing this approach so far. Instead of changing the symbol name itself, we only print the suffix where needed. This allows us to efficiently lookup the symbol for a given name without first having to append the suffix before the lookup. Signed-off-by: Milian Wolff Reviewed-by: Jiri Olsa Reviewed-by: Namhyung Kim Cc: David Ahern Cc: Peter Zijlstra Cc: Yao Jin Link: http://lkml.kernel.org/r/20171009203310.17362-8-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/util/callchain.c | 10 +++++++--- tools/perf/util/sort.c | 3 +++ 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/tools/perf/util/callchain.c b/tools/perf/util/callchain.c index 0f2ba49..77031ef 100644 --- a/tools/perf/util/callchain.c +++ b/tools/perf/util/callchain.c @@ -1111,11 +1111,15 @@ char *callchain_list__sym_name(struct callchain_list *cl, int printed; if (cl->ms.sym) { + const char *inlined = cl->ms.sym->inlined ? " (inlined)" : ""; + if (show_srcline && cl->srcline) - printed = scnprintf(bf, bfsize, "%s %s", - cl->ms.sym->name, cl->srcline); + printed = scnprintf(bf, bfsize, "%s %s%s", + cl->ms.sym->name, cl->srcline, + inlined); else - printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name); + printed = scnprintf(bf, bfsize, "%s%s", + cl->ms.sym->name, inlined); } else printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip); diff --git a/tools/perf/util/sort.c b/tools/perf/util/sort.c index eb3ab90..acb9210 100644 --- a/tools/perf/util/sort.c +++ b/tools/perf/util/sort.c @@ -283,6 +283,9 @@ static int _hist_entry__sym_snprintf(struct map *map, struct symbol *sym, ret += repsep_snprintf(bf + ret, size - ret, "%.*s", width - ret, sym->name); + if (sym->inlined) + ret += repsep_snprintf(bf + ret, size - ret, + " (inlined)"); } } else { size_t len = BITS_PER_LONG / 4;