perf gtk/annotate: Fail early if it can't annotate

Don't need to setup a browser window if annotate cannot work.

Signed-off-by: Namhyung Kim <namhyung@kernel.org>
Cc: Andi Kleen <andi@firstfloor.org>
Cc: Borislav Petkov <bp@alien8.de>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Pekka Enberg <penberg@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1360227734-375-7-git-send-email-namhyung@kernel.org
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c
index 2fe056b0096c9f25bb7da77f403653543c075a8e..7d8dc581a54592d9ebe8bcd71c60fc04b122019a 100644 (file)
--- a/tools/perf/ui/gtk/annotate.c
+++ b/tools/perf/ui/gtk/annotate.c
@@ -97,14 +97,6 @@ static int perf_gtk__annotate_symbol(GtkWidget *window, struct symbol *sym,
        int i;
        char s[512];
 
-       if (map->dso->annotate_warned)
-               return -1;
-
-       if (symbol__annotate(sym, map, 0) < 0) {
-               ui__error("%s", ui_helpline__current);
-               return -1;
-       }
-
        notes = symbol__annotation(sym);
 
        for (i = 0; i < MAX_ANN_COLS; i++) {
@@ -155,6 +147,14 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx,
        GtkWidget *scrolled_window;
        GtkWidget *tab_label;
 
+       if (map->dso->annotate_warned)
+               return -1;
+
+       if (symbol__annotate(sym, map, 0) < 0) {
+               ui__error("%s", ui_helpline__current);
+               return -1;
+       }
+
        if (perf_gtk__is_active_context(pgctx)) {
                window = pgctx->main_window;
                notebook = pgctx->notebook;