From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752466AbbJFHQ1 (ORCPT ); Tue, 6 Oct 2015 03:16:27 -0400 Received: from terminus.zytor.com ([198.137.202.10]:55896 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751922AbbJFHQZ (ORCPT ); Tue, 6 Oct 2015 03:16:25 -0400 Date: Tue, 6 Oct 2015 00:15:37 -0700 From: tip-bot for Jiri Olsa Message-ID: Cc: a.p.zijlstra@chello.nl, tglx@linutronix.de, namhyung@kernel.org, jolsa@kernel.org, kan.liang@intel.com, peterz@infradead.org, hpa@zytor.com, acme@redhat.com, mingo@kernel.org, dzickus@redhat.com, dsahern@gmail.com, linux-kernel@vger.kernel.org Reply-To: hpa@zytor.com, peterz@infradead.org, acme@redhat.com, jolsa@kernel.org, kan.liang@intel.com, a.p.zijlstra@chello.nl, namhyung@kernel.org, tglx@linutronix.de, linux-kernel@vger.kernel.org, dzickus@redhat.com, dsahern@gmail.com, mingo@kernel.org In-Reply-To: <1444068369-20978-10-git-send-email-jolsa@kernel.org> References: <1444068369-20978-10-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf tools: Handle -h and -v options Git-Commit-ID: a1853e2c6f8ed488adcd84fb162c5b3f0b674d9b X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: a1853e2c6f8ed488adcd84fb162c5b3f0b674d9b Gitweb: http://git.kernel.org/tip/a1853e2c6f8ed488adcd84fb162c5b3f0b674d9b Author: Jiri Olsa AuthorDate: Mon, 5 Oct 2015 20:06:09 +0200 Committer: Arnaldo Carvalho de Melo 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 Signed-off-by: Jiri Olsa Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Don Zickus Cc: Kan Liang Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1444068369-20978-10-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- 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)) {