perf callchain: Store srcline in callchain_cursor_node

This is mostly a preparation to enable the creation of full callchain
nodes for inline frames. Such frames will reference the IP of the
non-inlined frame, but hold the symbol and srcline for an inlined
location. As such, we won't be able to query the srcline on-demand based
on the IP alone. Instead, we will leverage the functionality provided by
this patch here, and store the srcline for the inlined nodes in the new
srcline member of callchain_cursor_node.

Note that this patch on its own leaks the srcline, as there is no
free_callchain_cursor_node or similar. A future patch will add caching
of the srcline and handle deletion properly.

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-3-milian.wolff@kdab.com
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

1 files changed, 16 insertions, 2 deletions

diff --git a/tools/perf/util/machine.c b/tools/perf/util/machine.c
index 7c3aa479201a..a37e1c056415 100644
--- a/tools/perf/util/machine.c
+++ b/tools/perf/util/machine.c
@@ -1709,6 +1709,15 @@ struct mem_info *sample__resolve_mem(struct perf_sample *sample,
         return mi;
 }
 
+static char *callchain_srcline(struct map *map, struct symbol *sym, u64 ip)
+{
+        if (!map || callchain_param.key == CCKEY_FUNCTION)
+                return NULL;
+
+        return get_srcline(map->dso, map__rip_2objdump(map, ip),
+                           sym, false, callchain_param.key == CCKEY_ADDRESS);
+}
+
 struct iterations {
         int nr_loop_iter;
         u64 cycles;
@@ -1728,6 +1737,7 @@ static int add_callchain_ip(struct thread *thread,
         struct addr_location al;
         int nr_loop_iter = 0;
         u64 iter_cycles = 0;
+        const char *srcline = NULL;
 
         al.filtered = 0;
         al.sym = NULL;
@@ -1783,9 +1793,10 @@ static int add_callchain_ip(struct thread *thread,
                 iter_cycles = iter->cycles;
         }
 
+        srcline = callchain_srcline(al.map, al.sym, al.addr);
         return callchain_cursor_append(cursor, al.addr, al.map, al.sym,
                                        branch, flags, nr_loop_iter,
-                                       iter_cycles, branch_from);
+                                       iter_cycles, branch_from, srcline);
 }
 
 struct branch_info *sample__resolve_bstack(struct perf_sample *sample,
@@ -2101,12 +2112,15 @@ check_calls:
 static int unwind_entry(struct unwind_entry *entry, void *arg)
 {
         struct callchain_cursor *cursor = arg;
+        const char *srcline = NULL;
 
         if (symbol_conf.hide_unresolved && entry->sym == NULL)
                 return 0;
+
+        srcline = callchain_srcline(entry->map, entry->sym, entry->ip);
         return callchain_cursor_append(cursor, entry->ip,
                                        entry->map, entry->sym,
-                                       false, NULL, 0, 0, 0);
+                                       false, NULL, 0, 0, 0, srcline);
 }
 
 static int thread__resolve_callchain_unwind(struct thread *thread,