lkml.org 
[lkml]   [2015]   [Dec]   [14]   [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: Check argument before calling setup_browser()
    Commit-ID:  b3f38fc2422ace049110d1588a67b35bd15b81ce
    Gitweb: http://git.kernel.org/tip/b3f38fc2422ace049110d1588a67b35bd15b81ce
    Author: Namhyung Kim <namhyung@kernel.org>
    AuthorDate: Thu, 10 Dec 2015 12:00:56 +0900
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Thu, 10 Dec 2015 14:35:58 -0300

    perf report: Check argument before calling setup_browser()

    This is necessary to get rid of the browser dependency from
    usage_with_options() and its friends. Because there's no code
    changing the argc and argv, it'd be ok to check it early.

    Signed-off-by: Namhyung Kim <namhyung@kernel.org>
    Reviewed-by: Josh Poimboeuf <jpoimboe@redhat.com>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Jiri Olsa <jolsa@redhat.com>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1449716459-23004-5-git-send-email-namhyung@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/builtin-report.c | 21 ++++++++++-----------
    1 file changed, 10 insertions(+), 11 deletions(-)

    diff --git a/tools/perf/builtin-report.c b/tools/perf/builtin-report.c
    index af5db88..5a45466 100644
    --- a/tools/perf/builtin-report.c
    +++ b/tools/perf/builtin-report.c
    @@ -801,6 +801,16 @@ int cmd_report(int argc, const char **argv, const char *prefix __maybe_unused)
    perf_config(report__config, &report);

    argc = parse_options(argc, argv, options, report_usage, 0);
    + if (argc) {
    + /*
    + * Special case: if there's an argument left then assume that
    + * it's a symbol filter:
    + */
    + if (argc > 1)
    + usage_with_options(report_usage, options);
    +
    + report.symbol_filter_str = argv[0];
    + }

    if (symbol_conf.vmlinux_name &&
    access(symbol_conf.vmlinux_name, R_OK)) {
    @@ -946,17 +956,6 @@ repeat:
    if (symbol__init(&session->header.env) < 0)
    goto error;

    - if (argc) {
    - /*
    - * Special case: if there's an argument left then assume that
    - * it's a symbol filter:
    - */
    - if (argc > 1)
    - usage_with_options(report_usage, options);
    -
    - report.symbol_filter_str = argv[0];
    - }
    -
    sort__setup_elide(stdout);

    ret = __cmd_report(&report);

    \
     
     \ /
      Last update: 2015-12-14 10:01    [W:4.849 / U:0.412 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site