Commit 23f0981b authored by Andi Kleen's avatar Andi Kleen Committed by Arnaldo Carvalho de Melo

perf callchain: Enable printing the srcline in the history

For lbr-as-callgraph we need to see the line number in the history,
because many LBR entries can be in a single function, and just
showing the same function name many times is not useful.

When the history code is configured to sort by address, also try to
resolve the address to a file:srcline and display this in the browser.
If that doesn't work still display the address.

This can be also useful without LBRs for understanding which call in a large
function (or in which inlined function) called something else.

Contains fixes from Namhyung Kim

v2: Refactor code into common function
v3: Fix GTK build
v4: Rebase
Signed-off-by: default avatarAndi Kleen <ak@linux.intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1415844328-4884-7-git-send-email-andi@firstfloor.orgSigned-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent a7444af6
...@@ -815,6 +815,15 @@ char *callchain_list__sym_name(struct callchain_list *cl, ...@@ -815,6 +815,15 @@ char *callchain_list__sym_name(struct callchain_list *cl,
int printed; int printed;
if (cl->ms.sym) { if (cl->ms.sym) {
if (callchain_param.key == CCKEY_ADDRESS &&
cl->ms.map && !cl->srcline)
cl->srcline = get_srcline(cl->ms.map->dso,
map__rip_2objdump(cl->ms.map,
cl->ip));
if (cl->srcline)
printed = scnprintf(bf, bfsize, "%s %s",
cl->ms.sym->name, cl->srcline);
else
printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name); printed = scnprintf(bf, bfsize, "%s", cl->ms.sym->name);
} else } else
printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip); printed = scnprintf(bf, bfsize, "%#" PRIx64, cl->ip);
......
...@@ -70,6 +70,7 @@ extern struct callchain_param callchain_param; ...@@ -70,6 +70,7 @@ extern struct callchain_param callchain_param;
struct callchain_list { struct callchain_list {
u64 ip; u64 ip;
struct map_symbol ms; struct map_symbol ms;
char *srcline;
struct list_head list; struct list_head list;
}; };
......
...@@ -258,7 +258,7 @@ char *get_srcline(struct dso *dso, unsigned long addr) ...@@ -258,7 +258,7 @@ char *get_srcline(struct dso *dso, unsigned long addr)
const char *dso_name; const char *dso_name;
if (!dso->has_srcline) if (!dso->has_srcline)
return SRCLINE_UNKNOWN; goto out;
if (dso->symsrc_filename) if (dso->symsrc_filename)
dso_name = dso->symsrc_filename; dso_name = dso->symsrc_filename;
...@@ -289,7 +289,9 @@ char *get_srcline(struct dso *dso, unsigned long addr) ...@@ -289,7 +289,9 @@ char *get_srcline(struct dso *dso, unsigned long addr)
dso->has_srcline = 0; dso->has_srcline = 0;
dso__free_a2l(dso); dso__free_a2l(dso);
} }
if (asprintf(&srcline, "%s[%lx]", dso->short_name, addr) < 0)
return SRCLINE_UNKNOWN; return SRCLINE_UNKNOWN;
return srcline;
} }
void free_srcline(char *srcline) void free_srcline(char *srcline)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment