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

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

perf annotate: Delay UI browser setup after initialization is done 



Move setup_browser after all necessary initialization is done.  This is
to remove the browser dependency from usage_with_options and friends.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Reviewed-by: default avatarJosh Poimboeuf <jpoimboe@redhat.com>
Tested-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1449716459-23004-3-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 50e19ef9

tools/perf/builtin-annotate.c

+9 −9
Original line number Diff line number Diff line
@@ -354,17 +354,8 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
		annotate.sym_hist_filter = argv[0];

	}



	if (annotate.use_stdio)

		use_browser = 0;

	else if (annotate.use_tui)

		use_browser = 1;

	else if (annotate.use_gtk)

		use_browser = 2;



	file.path  = input_name;



	setup_browser(true);



	annotate.session = perf_session__new(&file, false, &annotate.tool);

	if (annotate.session == NULL)

		return -1;
@@ -379,6 +370,15 @@ int cmd_annotate(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (setup_sorting() < 0)

		usage_with_options(annotate_usage, options);



	if (annotate.use_stdio)

		use_browser = 0;

	else if (annotate.use_tui)

		use_browser = 1;

	else if (annotate.use_gtk)

		use_browser = 2;



	setup_browser(true);



	ret = __cmd_annotate(&annotate);



out_delete: