perf annotate: Show better message when no vmlinux is found
Commit-ID: 170ae6bc24e1d7f9bd921a484ec9ea2825497970 Gitweb: http://git.kernel.org/tip/170ae6bc24e1d7f9bd921a484ec9ea2825497970 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Wed, 23 Feb 2011 11:08:59 -0300 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Wed, 23 Feb 2011 12:13:39 -0300
perf annotate: Show better message when no vmlinux is found
In both --tui and --stdio, in 'annotate', 'top', 'report' when trying to annotate a kernel symbol having just access to a kallsyms file, that doesn't have the DWARF info needed for annotation.
Suggested-by Ingo Molnar <[email protected]>
Cc Frederic Weisbecker <[email protected]>
Cc Ingo Molnar <[email protected]>
Cc Mike Galbraith <[email protected]>
Cc Paul Mackerras <[email protected]>
Cc Peter Zijlstra <[email protected]>
Cc Stephane Eranian <[email protected]>
Cc Tom Zanussi <[email protected]>
LKML-Reference: <new-submission>
Signed-off-by Arnaldo Carvalho de Melo <[email protected]>
--- tools/perf/util/annotate.c | 15 +++++++++++++-- tools/perf/util/ui/browsers/hists.c | 8 -------- 2 files changed, 13 insertions(+), 10 deletions(-)
tools/perf/util/annotate.c +13 -2
@@ -295,12 +295,23 @@ fallback: }if (dso->origin ==DSO__ORIG_KERNEL ) { +char bf[BUILD_ID_SIZE *2 +16 ] =" with build id " ; +char *build_id_msg =NULL ; +if (dso->annotate_warned) goto out_free_filename; + +if (dso->has_build_id) { +build_id__sprintf (dso->build_id, +sizeof (dso->build_id), bf +15 ); + build_id_msg = bf; + } err = -ENOENT ; dso->annotate_warned =1 ; -pr_err ("Can't annotate %s: No vmlinux file was found in the " -"path\n" , sym->name); +pr_err ("Can't annotate %s: No vmlinux file%s was found in the " +"path.\nPlease use 'perf buildid-cache -av vmlinux' or " +"--vmlinux vmlinux.\n" , + sym->name, build_id_msg ?:"" ); goto out_free_filename; }
tools/perf/util/ui/browsers/hists.c +0 -8
@@ -924,14 +924,6 @@ int hists__browse(struct hists *self, const char *helpline,if (choice == annotate) {struct hist_entry *he; do_annotate: -if (browser->selection->map->dso->origin ==DSO__ORIG_KERNEL ) { - browser->selection->map->dso->annotate_warned =1 ; -ui_helpline__puts ("No vmlinux file found, can't " -"annotate with just a " -"kallsyms file" ); -continue ; - } - he =hist_browser__selected_entry (browser);if (he ==NULL )continue ;