diff options
author | Namhyung Kim <namhyung.kim@lge.com> | 2013-02-07 04:02:13 -0500 |
---|---|---|
committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2013-02-14 12:59:28 -0500 |
commit | c0e79be74907b4654b622601692e1a27fd1dbeb3 (patch) | |
tree | 1b42d81a1f71ad0b18c0b5461e281997cf25abd2 /tools/perf/ui | |
parent | 237522378604a2e26e19a8b11a70171eaf98c6c5 (diff) |
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>
Diffstat (limited to 'tools/perf/ui')
-rw-r--r-- | tools/perf/ui/gtk/annotate.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/tools/perf/ui/gtk/annotate.c b/tools/perf/ui/gtk/annotate.c index 2fe056b0096c..7d8dc581a545 100644 --- 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, | |||
97 | int i; | 97 | int i; |
98 | char s[512]; | 98 | char s[512]; |
99 | 99 | ||
100 | if (map->dso->annotate_warned) | ||
101 | return -1; | ||
102 | |||
103 | if (symbol__annotate(sym, map, 0) < 0) { | ||
104 | ui__error("%s", ui_helpline__current); | ||
105 | return -1; | ||
106 | } | ||
107 | |||
108 | notes = symbol__annotation(sym); | 100 | notes = symbol__annotation(sym); |
109 | 101 | ||
110 | for (i = 0; i < MAX_ANN_COLS; i++) { | 102 | for (i = 0; i < MAX_ANN_COLS; i++) { |
@@ -155,6 +147,14 @@ int symbol__gtk_annotate(struct symbol *sym, struct map *map, int evidx, | |||
155 | GtkWidget *scrolled_window; | 147 | GtkWidget *scrolled_window; |
156 | GtkWidget *tab_label; | 148 | GtkWidget *tab_label; |
157 | 149 | ||
150 | if (map->dso->annotate_warned) | ||
151 | return -1; | ||
152 | |||
153 | if (symbol__annotate(sym, map, 0) < 0) { | ||
154 | ui__error("%s", ui_helpline__current); | ||
155 | return -1; | ||
156 | } | ||
157 | |||
158 | if (perf_gtk__is_active_context(pgctx)) { | 158 | if (perf_gtk__is_active_context(pgctx)) { |
159 | window = pgctx->main_window; | 159 | window = pgctx->main_window; |
160 | notebook = pgctx->notebook; | 160 | notebook = pgctx->notebook; |