Messages in this thread Patch in this message | | | From | Jiri Olsa <> | Subject | [PATCH 08/26] perf report: Move ui initialization ahead of sort setup | Date | Mon, 18 Jan 2016 10:24:06 +0100 |
| |
The ui initialization changes hpp format callbacks, based on the used browser. Thus we need this init being processed before setup_sorting.
Link: http://lkml.kernel.org/n/tip-8gngyjsfyua3dh3eifxgb980@git.kernel.org Signed-off-by: Jiri Olsa <jolsa@kernel.org> --- tools/perf/builtin-report.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c index 2fe654dd8d2b..0aa0fd3b4aa7 100644 --- a/tools/perf/builtin-report.c +++ b/tools/perf/builtin-report.c @@ -907,15 +907,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; @@ -925,6 +916,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); -- 2.4.3
| |