hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/1400480762-22852-11-git-send-email-namhyung@kernel.org
Signed-off-by: Jiri Olsa <jolsa@kernel.org>
This commit is contained in:
Namhyung Kim 2014-04-16 11:04:51 +09:00 committed by Jiri Olsa
parent 512ae1bd6a
commit 22af969e8c
5 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
tools/perf/builtin-report.c
View File

@ -823,16 +823,16 @@ repeat:
goto error; goto error;
} }
perf_hpp__init();
/* Force tty output for header output. */ /* Force tty output for header output. */
if (report.header || report.header_only) if (report.header || report.header_only)
use_browser = 0; use_browser = 0;
if (strcmp(input_name, "-") != 0) if (strcmp(input_name, "-") != 0)
setup_browser(true); setup_browser(true);
else { else
use_browser = 0; use_browser = 0;
perf_hpp__init();
}
if (report.header || report.header_only) { if (report.header || report.header_only) {
perf_session__fprintf_info(session, stdout, perf_session__fprintf_info(session, stdout,

2
tools/perf/builtin-top.c
View File

@ -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 */ /* display thread wants entries to be collapsed in a different tree */
sort__need_collapse = 1; sort__need_collapse = 1;
perf_hpp__init();
if (top.use_stdio) if (top.use_stdio)
use_browser = 0; use_browser = 0;
else if (top.use_tui) else if (top.use_tui)

2
tools/perf/ui/browsers/hists.c
View File

@ -661,8 +661,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)
void hist_browser__init_hpp(void) void hist_browser__init_hpp(void)
{ {
perf_hpp__init();
perf_hpp__format[PERF_HPP__OVERHEAD].color = perf_hpp__format[PERF_HPP__OVERHEAD].color =
hist_browser__hpp_color_overhead; hist_browser__hpp_color_overhead;
perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color = perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color =

2
tools/perf/ui/gtk/hists.c
View File

@ -58,8 +58,6 @@ __HPP_COLOR_PERCENT_FN(overhead_guest_us, period_guest_us)
void perf_gtk__init_hpp(void) void perf_gtk__init_hpp(void)
{ {
perf_hpp__init();
perf_hpp__format[PERF_HPP__OVERHEAD].color = perf_hpp__format[PERF_HPP__OVERHEAD].color =
perf_gtk__hpp_color_overhead; perf_gtk__hpp_color_overhead;
perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color = perf_hpp__format[PERF_HPP__OVERHEAD_SYS].color =

2
tools/perf/ui/setup.c
View File

@ -86,8 +86,6 @@ void setup_browser(bool fallback_to_pager)
use_browser = 0; use_browser = 0;
if (fallback_to_pager) if (fallback_to_pager)
setup_pager(); setup_pager();
perf_hpp__init();
break; break;
} }
} }