[PATCH v2] perf tools: set browser mode right before setup_browser()
From: Seokho Song
Date: Mon Dec 04 2017 - 11:03:20 EST
There are codes that print messages to the screen between assignment
of the use_browser variable and setup_browser().
But since the GUI browser is not initialized during that period,
all messages fail to show if the user passed the --gtk option
to perf as GTK is not initialized yet.
Reorder the code to assign use_browser variable right before
setup_browser() is called.
Acked-by: Namhyung Kim <namhyung@xxxxxxxxxx>
Signed-off-by: Seokho Song <0xdevssh@xxxxxxxxx>
Signed-off-by: Park Ju Hyung <qkrwngud825@xxxxxxxxx>
---
tools/perf/builtin-report.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
index 1394cd8d96f7..c763390084b9 100644
--- a/tools/perf/builtin-report.c
+++ b/tools/perf/builtin-report.c
@@ -918,13 +918,6 @@ int cmd_report(int argc, const char **argv)
return -EINVAL;
}
- if (report.use_stdio)
- use_browser = 0;
- else if (report.use_tui)
- use_browser = 1;
- else if (report.use_gtk)
- use_browser = 2;
-
if (report.inverted_callchain)
callchain_param.order = ORDER_CALLER;
if (symbol_conf.cumulate_callchain && !callchain_param.order_set)
@@ -1011,6 +1004,13 @@ int cmd_report(int argc, const char **argv)
perf_hpp_list.need_collapse = true;
}
+ if (report.use_stdio)
+ use_browser = 0;
+ else if (report.use_tui)
+ use_browser = 1;
+ else if (report.use_gtk)
+ use_browser = 2;
+
/* Force tty output for header output and per-thread stat. */
if (report.header || report.header_only || report.show_threads)
use_browser = 0;
--
2.15.1