Commit 22af969e authored by Namhyung Kim's avatar Namhyung Kim Committed by Jiri Olsa
Browse files

perf tools: Call perf_hpp__init() before setting up GUI browsers 



So that it can be set properly prior to set up output fields.  That
makes easy to handle/warn errors during the setup since it doesn't
need to be bothered with the GUI.

Signed-off-by: default avatarNamhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-11-git-send-email-namhyung@kernel.org


Signed-off-by: default avatarJiri Olsa <jolsa@kernel.org>
parent 512ae1bd

tools/perf/builtin-report.c

+3 −3
Original line number Diff line number Diff line
@@ -823,16 +823,16 @@ repeat: 
			goto error;

	}



	perf_hpp__init();



	/* Force tty output for header output. */

	if (report.header || report.header_only)

		use_browser = 0;



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

		setup_browser(true);

	else {

	else

		use_browser = 0;

		perf_hpp__init();

	}



	if (report.header || report.header_only) {

		perf_session__fprintf_info(session, stdout,

tools/perf/builtin-top.c

+2 −0
Original line number Diff line number Diff line
@@ -1147,6 +1147,8 @@ int cmd_top(int argc, const char **argv, const char *prefix __maybe_unused) 
	/* display thread wants entries to be collapsed in a different tree */

	sort__need_collapse = 1;



	perf_hpp__init();



	if (top.use_stdio)

		use_browser = 0;

	else if (top.use_tui)

tools/perf/ui/browsers/hists.c

+0 −2
Original line number Diff line number Diff line
@@ -661,8 +661,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) 


void hist_browser__init_hpp(void)

{

	perf_hpp__init();



	perf_hpp__format[PERF_HPP__OVERHEAD].color =

				hist_browser__hpp_color_overhead;

	perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color =

tools/perf/ui/gtk/hists.c

+0 −2
Original line number Diff line number Diff line
@@ -58,8 +58,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us) 


void perf_gtk__init_hpp(void)

{

	perf_hpp__init();



	perf_hpp__format[PERF_HPP__OVERHEAD].color =

				perf_gtk__hpp_color_overhead;

	perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color =

tools/perf/ui/setup.c

+0 −2
Original line number Diff line number Diff line
@@ -86,8 +86,6 @@ void setup_browser(bool fallback_to_pager) 
		use_browser = 0;

		if (fallback_to_pager)

			setup_pager();



		perf_hpp__init();

		break;

	}

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE