perf report: Move UI initialization ahead of sort setup (9887804d) · Commits · 戴 / test

The ui initialization changes hpp format callbacks, based on the used browser. Thus we need this init being processed before setup_sorting. Signed-off-by:

Jiri Olsa <jolsa@kernel.org> Tested-by:

Arnaldo Carvalho de Melo <acme@redhat.com> Cc: David Ahern <dsahern@gmail.com> Cc: Namhyung Kim <namhyung@kernel.org> Cc: Peter Zijlstra <a.p.zijlstra@chello.nl> Link: http://lkml.kernel.org/r/1453109064-1026-9-git-send-email-jolsa@kernel.org Signed-off-by:

Arnaldo Carvalho de Melo <acme@redhat.com>

tools/perf/builtin-report.c

+9 −9

Original line number	Diff line number	Diff line
		@@ -912,15 +912,6 @@ repeat:
		symbol_conf.cumulate_callchain = false;
		}

		if (setup_sorting(session->evlist) < 0) {
		if (sort_order)
		parse_options_usage(report_usage, options, "s", 1);
		if (field_order)
		parse_options_usage(sort_order ? NULL : report_usage,
		options, "F", 1);
		goto error;
		}

		/* Force tty output for header output and per-thread stat. */
		if (report.header \|\| report.header_only \|\| report.show_threads)
		use_browser = 0;
		@@ -930,6 +921,15 @@ repeat:
		else
		use_browser = 0;

		if (setup_sorting(session->evlist) < 0) {
		if (sort_order)
		parse_options_usage(report_usage, options, "s", 1);
		if (field_order)
		parse_options_usage(sort_order ? NULL : report_usage,
		options, "F", 1);
		goto error;
		}

		if (report.header \|\| report.header_only) {
		perf_session__fprintf_info(session, stdout,
		report.show_full_info);

Admin message