lkml.org 
[lkml]   [2015]   [Oct]   [6]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    Date
    From
    Subject[tip:perf/core] perf tools: Handle -h and -v options
    Commit-ID:  a1853e2c6f8ed488adcd84fb162c5b3f0b674d9b
    Gitweb: http://git.kernel.org/tip/a1853e2c6f8ed488adcd84fb162c5b3f0b674d9b
    Author: Jiri Olsa <jolsa@kernel.org>
    AuthorDate: Mon, 5 Oct 2015 20:06:09 +0200
    Committer: Arnaldo Carvalho de Melo <acme@redhat.com>
    CommitDate: Mon, 5 Oct 2015 16:36:18 -0300

    perf tools: Handle -h and -v options

    Adding handling for '-h' and '-v' options to invoke help and version
    command respectively.

    Current behaviour is:

    $ perf -v
    Unknown option: -v

    Usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS]
    $ perf -h
    Unknown option: -h

    Usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS]

    New behaviour:

    $ perf -h

    usage: perf [--version] [--help] [OPTIONS] COMMAND [ARGS]

    The most commonly used perf commands are:
    annotate Read perf.data (created by perf record) and display annotated code
    archive Create archive with object files with build-ids found in perf.data file
    bench General framework for benchmark suites
    ...

    $ perf -v
    perf version 4.3.rc3.gc99e32

    Updated man page.

    Requested-by: Peter Zijlstra <peterz@infradead.org>
    Signed-off-by: Jiri Olsa <jolsa@kernel.org>
    Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    Cc: David Ahern <dsahern@gmail.com>
    Cc: Don Zickus <dzickus@redhat.com>
    Cc: Kan Liang <kan.liang@intel.com>
    Cc: Namhyung Kim <namhyung@kernel.org>
    Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
    Link: http://lkml.kernel.org/r/1444068369-20978-10-git-send-email-jolsa@kernel.org
    Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
    ---
    tools/perf/Documentation/perf.txt | 8 ++++++++
    tools/perf/perf.c | 14 ++++++++++++++
    2 files changed, 22 insertions(+)

    diff --git a/tools/perf/Documentation/perf.txt b/tools/perf/Documentation/perf.txt
    index 2b13177..864e375 100644
    --- a/tools/perf/Documentation/perf.txt
    +++ b/tools/perf/Documentation/perf.txt
    @@ -27,6 +27,14 @@ OPTIONS
    Setup buildid cache directory. It has higher priority than
    buildid.dir config file option.

    +-v::
    +--version::
    + Display perf version.
    +
    +-h::
    +--help::
    + Run perf help command.
    +
    DESCRIPTION
    -----------
    Performance counters for Linux are a new kernel-based subsystem
    diff --git a/tools/perf/perf.c b/tools/perf/perf.c
    index 1fded92..5437134 100644
    --- a/tools/perf/perf.c
    +++ b/tools/perf/perf.c
    @@ -162,6 +162,20 @@ static int handle_options(const char ***argv, int *argc, int *envchanged)
    break;

    /*
    + * Shortcut for '-h' and '-v' options to invoke help
    + * and version command.
    + */
    + if (!strcmp(cmd, "-h")) {
    + (*argv)[0] = "--help";
    + break;
    + }
    +
    + if (!strcmp(cmd, "-v")) {
    + (*argv)[0] = "--version";
    + break;
    + }
    +
    + /*
    * Check remaining flags.
    */
    if (!prefixcmp(cmd, CMD_EXEC_PATH)) {

    \
     
     \ /
      Last update: 2015-10-06 09:41    [W:2.253 / U:1.072 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site