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

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

perf report: Postpone setting up browser after parsing options 



If setup_browser() called earlier than option parsing, the actual error
message can be discarded during the terminal reset.  So move it after
setup_sorting() checks whether the sort keys are valid.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Acked-by: default avatarIngo Molnar <mingo@kernel.org>
Reviewed-by: default avatarIngo Molnar <mingo@kernel.org>
Enthusiastically-Supported-by: default avatarIngo Molnar <mingo@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Link: http://lkml.kernel.org/r/1383291195-24386-3-git-send-email-namhyung@kernel.org


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

tools/perf/builtin-report.c

+12 −12
Original line number Original line Diff line number Diff line
@@ -905,13 +905,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
			input_name = "perf.data";

			input_name = "perf.data";

	}

	}





	if (strcmp(input_name, "-") != 0)

		setup_browser(true);

	else {

		use_browser = 0;

		perf_hpp__init();

	}



	file.path  = input_name;

	file.path  = input_name;

	file.force = report.force;

	file.force = report.force;
@@ -957,6 +950,18 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (setup_sorting() < 0)

	if (setup_sorting() < 0)

		usage_with_options(report_usage, options);

		usage_with_options(report_usage, options);





	if (parent_pattern != default_parent_pattern) {

		if (sort_dimension__add("parent") < 0)

			goto error;

	}



	if (strcmp(input_name, "-") != 0)

		setup_browser(true);

	else {

		use_browser = 0;

		perf_hpp__init();

	}



	/*

	/*

	 * Only in the TUI browser we are doing integrated annotation,

	 * Only in the TUI browser we are doing integrated annotation,

	 * so don't allocate extra space that won't be used in the stdio

	 * so don't allocate extra space that won't be used in the stdio
@@ -986,11 +991,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused) 
	if (symbol__init() < 0)

	if (symbol__init() < 0)

		goto error;

		goto error;





	if (parent_pattern != default_parent_pattern) {

		if (sort_dimension__add("parent") < 0)

			goto error;

	}



	if (argc) {

	if (argc) {

		/*

		/*

		 * Special case: if there's an argument left then assume that

		 * Special case: if there's an argument left then assume that