Skip to content

Commit

Permalink
perf tui: Remove annotate from popup menu after failure
Browse files Browse the repository at this point in the history
Cc: Frédéric Weisbecker <fweisbec@gmail.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Stephane Eranian <eranian@google.com>
Cc: Tom Zanussi <tzanussi@gmail.com>
LKML-Reference: <new-submission>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
  • Loading branch information
Arnaldo Carvalho de Melo committed May 22, 2010
1 parent 0e8dc25 commit 6e78c9f
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions tools/perf/util/newt.c
Original file line number Diff line number Diff line change
Expand Up @@ -914,6 +914,9 @@ int hists__browse(struct hists *self, const char *helpline, const char *input_na

switch (toupper(es.u.key)) {
case 'A':
if (browser->selection->map == NULL &&
browser->selection->map->dso->annotate_warned)
continue;
goto do_annotate;
case 'D':
goto zoom_dso;
Expand Down Expand Up @@ -957,6 +960,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *input_na
}

if (browser->selection->sym != NULL &&
!browser->selection->map->dso->annotate_warned &&
asprintf(&options[nr_options], "Annotate %s",
browser->selection->sym->name) > 0)
annotate = nr_options++;
Expand Down Expand Up @@ -991,6 +995,7 @@ int hists__browse(struct hists *self, const char *helpline, const char *input_na
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");
Expand Down

0 comments on commit 6e78c9f

Please sign in to comment.