perf annotate: Put dso name in symbol annotation title
Currently the symbol name is displayed at the top when displaying symbol annotation. Add to this the dso long name. Suggested-by: Arnaldo Carvalho de Melo <acme@redhat.com> Signed-off-by: Adrian Hunter <adrian.hunter@intel.com> Cc: David Ahern <dsahern@gmail.com> Cc: Frederic Weisbecker <fweisbec@gmail.com> Cc: Ingo Molnar <mingo@kernel.org> Cc: Jiri Olsa <jolsa@redhat.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Namhyung Kim <namhyung@gmail.com> Cc: Paul Mackerras <paulus@samba.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Stephane Eranian <eranian@google.com> Link: http://lkml.kernel.org/r/1375875537-4509-12-git-send-email-adrian.hunter@intel.com Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
This commit is contained in:
parent
bbb7f846f8
commit
34f77abcb3
|
@ -428,6 +428,14 @@ static void annotate_browser__init_asm_mode(struct annotate_browser *browser)
|
|||
browser->b.nr_entries = browser->nr_asm_entries;
|
||||
}
|
||||
|
||||
#define SYM_TITLE_MAX_SIZE (PATH_MAX + 64)
|
||||
|
||||
static int sym_title(struct symbol *sym, struct map *map, char *title,
|
||||
size_t sz)
|
||||
{
|
||||
return snprintf(title, sz, "%s %s", sym->name, map->dso->long_name);
|
||||
}
|
||||
|
||||
static bool annotate_browser__callq(struct annotate_browser *browser,
|
||||
struct perf_evsel *evsel,
|
||||
struct hist_browser_timer *hbt)
|
||||
|
@ -438,6 +446,7 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
|
|||
struct annotation *notes;
|
||||
struct symbol *target;
|
||||
u64 ip;
|
||||
char title[SYM_TITLE_MAX_SIZE];
|
||||
|
||||
if (!ins__is_call(dl->ins))
|
||||
return false;
|
||||
|
@ -461,7 +470,8 @@ static bool annotate_browser__callq(struct annotate_browser *browser,
|
|||
|
||||
pthread_mutex_unlock(¬es->lock);
|
||||
symbol__tui_annotate(target, ms->map, evsel, hbt);
|
||||
ui_browser__show_title(&browser->b, sym->name);
|
||||
sym_title(sym, ms->map, title, sizeof(title));
|
||||
ui_browser__show_title(&browser->b, title);
|
||||
return true;
|
||||
}
|
||||
|
||||
|
@ -653,8 +663,10 @@ static int annotate_browser__run(struct annotate_browser *browser,
|
|||
const char *help = "Press 'h' for help on key bindings";
|
||||
int delay_secs = hbt ? hbt->refresh : 0;
|
||||
int key;
|
||||
char title[SYM_TITLE_MAX_SIZE];
|
||||
|
||||
if (ui_browser__show(&browser->b, sym->name, help) < 0)
|
||||
sym_title(sym, ms->map, title, sizeof(title));
|
||||
if (ui_browser__show(&browser->b, title, help) < 0)
|
||||
return -1;
|
||||
|
||||
annotate_browser__calc_percent(browser, evsel);
|
||||
|
|
Loading…
Reference in a new issue