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: Use parse_options_usage() for -s option failure
    Commit-ID:  91aba0a62e24ff7a567e13e1d88deab711df6f0f
    Gitweb: http://git.kernel.org/tip/91aba0a62e24ff7a567e13e1d88deab711df6f0f
    Author: Namhyung Kim <namhyung.kim@lge.com>
    AuthorDate: Fri, 1 Nov 2013 16:33:13 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 4 Nov 2013 12:55:17 -0300

    perf report: Use parse_options_usage() for -s option failure

    The -s (--sort) option was processed after normal option parsing so that
    it cannot call the parse_options_usage() automatically. Currently it
    calls usage_with_options() which shows entire help messages for event
    option. Fix it by showing just -s options.

    $ perf report -s help
    Error: Unknown --sort key: `help'

    usage: perf report [<options>]

    -s, --sort <key[,key2...]>
    sort by key(s): pid, comm, dso, symbol, ...

    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-4-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-report.c | 6 ++++--
    1 file changed, 4 insertions(+), 2 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index 4df3161..25f83d5 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -947,8 +947,10 @@ repeat:
    sort_order = "local_weight,mem,sym,dso,symbol_daddr,dso_daddr,snoop,tlb,locked";
    }

    - if (setup_sorting() < 0)
    - usage_with_options(report_usage, options);
    + if (setup_sorting() < 0) {
    + parse_options_usage(report_usage, options, "s", 1);
    + goto error;
    + }

    if (parent_pattern != default_parent_pattern) {
    if (sort_dimension__add("parent") < 0)

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