aboutsummaryrefslogtreecommitdiff
path: root/tools/perf/util/newt.c
diff options
context:
space:
mode:
authorArnaldo Carvalho de Melo2010-03-15 13:04:33 -0300
committerIngo Molnar2010-03-15 17:16:25 +0100
commitd06d92b7c9b99ea52bdaeb13f544675529891b8a (patch)
treeeb8bb2979883cecd6af007cab9e10dc83a0dfd3a /tools/perf/util/newt.c
parentb0a9ab62ab96e258a0ddd81d7fe2719c3db36006 (diff)
perf annotate: Properly notify the user that vmlinux is missing
Before this patch we would not find a vmlinux, then try to pass objdump "[kernel.kallsyms]" as the filename, it would get confused and produce no output: [root@doppio ~]# perf annotate n_tty_write ------------------------------------------------ Percent | Source code & Disassembly of [kernel.kallsyms] ------------------------------------------------ Now we check that and emit meaningful warning: [root@doppio ~]# perf annotate n_tty_write Can't annotate n_tty_write: No vmlinux file was found in the path: [0] vmlinux [1] /boot/vmlinux [2] /boot/vmlinux-2.6.34-rc1-tip+ [3] /lib/modules/2.6.34-rc1-tip+/build/vmlinux [4] /usr/lib/debug/lib/modules/2.6.34-rc1-tip+/vmlinux [root@doppio ~]# This bug was introduced when we added automatic search for vmlinux, before that time the user had to specify a vmlinux file. v2: Print the warning just for the first symbol found when no symbol name is specified, otherwise it will spam the screen repeating the warning for each symbol. Reported-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com> Cc: Frédéric Weisbecker <fweisbec@gmail.com> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Cc: Paul Mackerras <paulus@samba.org> Cc: <stable@kernel.org> LKML-Reference: <1268669073-6856-1-git-send-email-acme@infradead.org> Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/newt.c')
-rw-r--r--tools/perf/util/newt.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/perf/util/newt.c b/tools/perf/util/newt.c
index 2836394459d9..2d19e7a3e6e8 100644
--- a/tools/perf/util/newt.c
+++ b/tools/perf/util/newt.c
@@ -63,7 +63,7 @@ static void hist_entry__annotate_browser(struct hist_entry *self)
if (self->sym == NULL)
return;
- if (asprintf(&str, "perf annotate %s | expand", self->sym->name) < 0)
+ if (asprintf(&str, "perf annotate %s 2>&1 | expand", self->sym->name) < 0)
return;
fp = popen(str, "r");