lkml.org 
[lkml]   [2013]   [Nov]   [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: Postpone setting up browser after parsing options
    Commit-ID:  4bceffbc26fab2444742db59c6f8124c29e41369
    Gitweb: http://git.kernel.org/tip/4bceffbc26fab2444742db59c6f8124c29e41369
    Author: Namhyung Kim <namhyung.kim@lge.com>
    AuthorDate: Fri, 1 Nov 2013 16:33:12 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 4 Nov 2013 12:54:32 -0300

    perf report: Postpone setting up browser after parsing options

    If setup_browser() called earlier than option parsing, the actual error
    message can be discarded during the terminal reset. So move it after
    setup_sorting() checks whether the sort keys are valid.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Acked-by: Ingo Molnar <mingo@kernel.org>
    Reviewed-by: Ingo Molnar <mingo@kernel.org>
    Enthusiastically-Supported-by: Ingo Molnar <mingo@kernel.org>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Ingo Molnar <mingo@kernel.org>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Paul Mackerras <paulus@samba.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1383291195-24386-3-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-report.c | 24 ++++++++++++------------
    1 file changed, 12 insertions(+), 12 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index 98d3891..4df3161 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -905,13 +905,6 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
    input_name = "perf.data";
    }

    - if (strcmp(input_name, "-") != 0)
    - setup_browser(true);
    - else {
    - use_browser = 0;
    - perf_hpp__init();
    - }
    -
    file.path = input_name;
    file.force = report.force;

    @@ -957,6 +950,18 @@ repeat:
    if (setup_sorting() < 0)
    usage_with_options(report_usage, options);

    + if (parent_pattern != default_parent_pattern) {
    + if (sort_dimension__add("parent") < 0)
    + goto error;
    + }
    +
    + if (strcmp(input_name, "-") != 0)
    + setup_browser(true);
    + else {
    + use_browser = 0;
    + perf_hpp__init();
    + }
    +
    /*
    * Only in the TUI browser we are doing integrated annotation,
    * so don't allocate extra space that won't be used in the stdio
    @@ -986,11 +991,6 @@ repeat:
    if (symbol__init() < 0)
    goto error;

    - if (parent_pattern != default_parent_pattern) {
    - if (sort_dimension__add("parent") < 0)
    - goto error;
    - }
    -
    if (argc) {
    /*
    * Special case: if there's an argument left then assume that

    \
     
     \ /
      Last update: 2013-11-04 21:41    [W:3.024 / U:0.152 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site