Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c0e79be7 authored by Namhyung Kim's avatar Namhyung Kim Committed by Arnaldo Carvalho de Melo
Browse files

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: default avatarNamhyung 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: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 23752237

tools/perf/ui/gtk/annotate.c

+8 −8
Original line number Diff line number Diff line
@@ -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;