[PATCH v2 05/14] perf report: mark inlined frames in output by " (inlined)" suffix

[Milian Wolff]

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 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Yao Jin 
Signed-off-by: Milian Wolff 
---
 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 6afa8ccd75b5..5e099fe0b9dc 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 12359bd986db..66fa841717fb 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.13.3

[PATCH v2 05/14] perf report: mark inlined frames in output by " (inlined)" suffix

[Milian Wolff]

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 
Cc: David Ahern 
Cc: Namhyung Kim 
Cc: Peter Zijlstra 
Cc: Yao Jin 
Signed-off-by: Milian Wolff 
---
 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 6afa8ccd75b5..5e099fe0b9dc 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 12359bd986db..66fa841717fb 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.13.3