lkml.org 
[lkml]   [2016]   [Feb]   [4]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf report: Move UI initialization ahead of sort setup
    Commit-ID:  9887804d01abf7a4e03cfd6be0312d0a5c4e4aba
    Gitweb: http://git.kernel.org/tip/9887804d01abf7a4e03cfd6be0312d0a5c4e4aba
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Mon, 18 Jan 2016 10:24:06 +0100
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Wed, 3 Feb 2016 12:24:03 -0300

    perf report: Move UI initialization ahead of sort setup

    The ui initialization changes hpp format callbacks, based on the used
    browser. Thus we need this init being processed before setup_sorting.

    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1453109064-1026-9-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    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 54ce047..1eab50a 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -912,15 +912,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;
    @@ -930,6 +921,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);
    \
     
     \ /
      Last update: 2016-02-04 14:21    [W:5.147 / U:0.004 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site