From: Milian Wolff <milian.wolff@kdab.com>
To: acme@kernel.org, jolsa@kernel.org, Jin Yao <yao.jin@linux.intel.com>
Cc: Linux-kernel@vger.kernel.org, linux-perf-users@vger.kernel.org,
Milian Wolff <milian.wolff@kdab.com>,
Arnaldo Carvalho de Melo <acme@redhat.com>,
David Ahern <dsahern@gmail.com>,
Namhyung Kim <namhyung@kernel.org>,
Peter Zijlstra <a.p.zijlstra@chello.nl>
Subject: [PATCH v3 05/13] perf report: mark inlined frames in output by " (inlined)" suffix
Date: Wed, 6 Sep 2017 15:54:53 +0200 [thread overview]
Message-ID: <20170906135501.306-6-milian.wolff@kdab.com> (raw)
In-Reply-To: <20170906135501.306-1-milian.wolff@kdab.com>
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.
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Yao Jin <yao.jin@linux.intel.com>
Signed-off-by: Milian Wolff <milian.wolff@kdab.com>
---
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 daf491ea0a7f..18362b23a976 100644
--- a/tools/perf/util/callchain.c
+++ b/tools/perf/util/callchain.c
@@ -1100,11 +1100,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 eb3ab902a1c0..acb9210fd18a 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;
--
2.14.1
next prev parent reply other threads:[~2017-09-06 13:58 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-09-06 13:54 [PATCH v3 00/13] generate full callchain cursor entries for inlined frames Milian Wolff
2017-09-06 13:54 ` [PATCH v3 01/13] perf report: remove code to handle inline frames from browsers Milian Wolff
2017-09-18 11:56 ` Jiri Olsa
2017-09-18 12:43 ` Milian Wolff
2017-09-06 13:54 ` [PATCH v3 02/13] perf util: store srcline in callchain_cursor_node Milian Wolff
2017-09-06 13:54 ` [PATCH v3 03/13] perf report: create real callchain entries for inlined frames Milian Wolff
2017-09-19 12:27 ` Jiri Olsa
2017-10-01 12:37 ` Milian Wolff
2017-10-01 17:40 ` Joe Perches
2017-09-19 12:27 ` Jiri Olsa
2017-10-01 14:12 ` Milian Wolff
2017-09-19 12:27 ` Jiri Olsa
2017-10-01 12:40 ` Milian Wolff
2017-09-06 13:54 ` [PATCH v3 04/13] perf report: fall-back to function name comparison for -g srcline Milian Wolff
2017-09-06 13:54 ` Milian Wolff [this message]
2017-09-06 13:54 ` [PATCH v3 06/13] perf script: mark inlined frames and do not print DSO for them Milian Wolff
2017-09-06 13:54 ` [PATCH v3 07/13] perf report: compare symbol name for inlined frames when matching Milian Wolff
2017-09-06 13:54 ` [PATCH v3 08/13] perf report: compare symbol name for inlined frames when sorting Milian Wolff
2017-09-06 13:54 ` [PATCH v3 09/13] perf report: properly handle branch count in match_chain Milian Wolff
2017-09-06 13:54 ` [PATCH v3 10/13] perf report: cache failed lookups of inlined frames Milian Wolff
2017-09-06 13:54 ` [PATCH v3 11/13] perf report: cache srclines for callchain nodes Milian Wolff
2017-09-06 13:55 ` [PATCH v3 12/13] perf report: use srcline from callchain for hist entries Milian Wolff
2017-09-06 13:55 ` [PATCH v3 13/13] perf util: enable handling of inlined frames by default Milian Wolff
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170906135501.306-6-milian.wolff@kdab.com \
--to=milian.wolff@kdab.com \
--cc=Linux-kernel@vger.kernel.org \
--cc=a.p.zijlstra@chello.nl \
--cc=acme@kernel.org \
--cc=acme@redhat.com \
--cc=dsahern@gmail.com \
--cc=jolsa@kernel.org \
--cc=linux-perf-users@vger.kernel.org \
--cc=namhyung@kernel.org \
--cc=yao.jin@linux.intel.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®