perf callchain: Create real callchain entries for inlined frames
The inline_node structs are maintained by the new dso->inlines tree. This in turn keeps ownership of the fake symbols and srcline string representing an inline frame. This tree is sorted by address to allow quick lookups. All other entries of the symbol beside the function name are unused for inline frames. The advantage of this approach is that all existing users of the callchain API can now transparently display inlined frames without having to patch their code. Signed-off-by: Milian Wolff <milian.wolff@kdab.com> Reviewed-by: Jiri Olsa <jolsa@redhat.com> Reviewed-by: Namhyung Kim <namhyung@kernel.org> Cc: David Ahern <dsahern@gmail.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Yao Jin <yao.jin@linux.intel.com> Link: http://lkml.kernel.org/r/20171009203310.17362-6-milian.wolff@kdab.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:

committed by
Arnaldo Carvalho de Melo

parent
2be8832f3c
commit
11ea2515f3
@@ -2109,6 +2109,40 @@ check_calls:
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int append_inlines(struct callchain_cursor *cursor,
|
||||
struct map *map, struct symbol *sym, u64 ip)
|
||||
{
|
||||
struct inline_node *inline_node;
|
||||
struct inline_list *ilist;
|
||||
u64 addr;
|
||||
|
||||
if (!symbol_conf.inline_name || !map || !sym)
|
||||
return 1;
|
||||
|
||||
addr = map__rip_2objdump(map, ip);
|
||||
|
||||
inline_node = inlines__tree_find(&map->dso->inlined_nodes, addr);
|
||||
if (!inline_node) {
|
||||
inline_node = dso__parse_addr_inlines(map->dso, addr, sym);
|
||||
if (!inline_node)
|
||||
return 1;
|
||||
|
||||
inlines__tree_insert(&map->dso->inlined_nodes, inline_node);
|
||||
}
|
||||
|
||||
list_for_each_entry(ilist, &inline_node->val, list) {
|
||||
int ret = callchain_cursor_append(cursor, ip, map,
|
||||
ilist->symbol, false,
|
||||
NULL, 0, 0, 0,
|
||||
ilist->srcline);
|
||||
|
||||
if (ret != 0)
|
||||
return ret;
|
||||
}
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
static int unwind_entry(struct unwind_entry *entry, void *arg)
|
||||
{
|
||||
struct callchain_cursor *cursor = arg;
|
||||
@@ -2117,6 +2151,9 @@ static int unwind_entry(struct unwind_entry *entry, void *arg)
|
||||
if (symbol_conf.hide_unresolved && entry->sym == NULL)
|
||||
return 0;
|
||||
|
||||
if (append_inlines(cursor, entry->map, entry->sym, entry->ip) == 0)
|
||||
return 0;
|
||||
|
||||
srcline = callchain_srcline(entry->map, entry->sym, entry->ip);
|
||||
return callchain_cursor_append(cursor, entry->ip,
|
||||
entry->map, entry->sym,
|
||||
|
Reference in New Issue
Block a user