Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1758581AbaJ3GpW (ORCPT ); Thu, 30 Oct 2014 02:45:22 -0400 Received: from terminus.zytor.com ([198.137.202.10]:38048 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758154AbaJ3GpS (ORCPT ); Thu, 30 Oct 2014 02:45:18 -0400 Date: Wed, 29 Oct 2014 23:44:26 -0700 From: tip-bot for Namhyung Kim Message-ID: Cc: tglx@linutronix.de, yarygin@linux.vnet.ibm.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, acme@redhat.com, hpa@zytor.com, jolsa@redhat.com, mingo@kernel.org, hemant@linux.vnet.ibm.com, peterz@infradead.org, namhyung@kernel.org Reply-To: namhyung@kernel.org, peterz@infradead.org, hemant@linux.vnet.ibm.com, jolsa@redhat.com, mingo@kernel.org, acme@redhat.com, hpa@zytor.com, linux-kernel@vger.kernel.org, dsahern@gmail.com, tglx@linutronix.de, yarygin@linux.vnet.ibm.com In-Reply-To: <1413990949-13953-4-git-send-email-namhyung@kernel.org> References: <1413990949-13953-4-git-send-email-namhyung@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf kvm: Print kvm specific --help output Git-Commit-ID: f45d20ffb654f4559648da402b1608e747d46942 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: f45d20ffb654f4559648da402b1608e747d46942 Gitweb: http://git.kernel.org/tip/f45d20ffb654f4559648da402b1608e747d46942 Author: Namhyung Kim AuthorDate: Thu, 23 Oct 2014 00:15:47 +0900 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 29 Oct 2014 10:32:47 -0200 perf kvm: Print kvm specific --help output The 'perf kvm stat record' tool is an alias of 'perf record' with predefined kvm related options. All options that passed to 'perf kvm stat record' are processed by the 'perf record' tool. So, 'perf kvm stat record --help' prints help of usage for the 'perf record' command. There are a few options useful for 'perf kvm stat record', the rest either break kvm related output or don't change it. Let's print safe for 'perf kvm stat record' options in addition to general 'perf record' --help output. With this patch, new output looks like below: $ perf kvm stat record -h usage: perf kvm stat record [] -p, --pid record events on existing process id -t, --tid record events on existing thread id -r, --realtime collect data with this RT SCHED_FIFO priority --no-buffering collect data without buffering -a, --all-cpus system-wide collection from all CPUs -C, --cpu list of cpus to monitor -c, --count event period to sample -o, --output output file name -i, --no-inherit child tasks do not inherit counters -m, --mmap-pages number of mmap data pages -v, --verbose be more verbose (show counter open errors, etc) -q, --quiet don't print any message -s, --stat per thread counts -D, --delay ms to wait before starting measurement after program start -u, --uid user to profile --per-thread use per-thread mmaps $ perf kvm stat record -n sleep 1 Error: switch `n' is not usable usage: perf kvm stat record [] Signed-off-by: Namhyung Kim Acked-by: Hemant Kumar Cc: Alexander Yarygin Cc: David Ahern Cc: Ingo Molnar Cc: Jiri Olsa Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1413990949-13953-4-git-send-email-namhyung@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-kvm.c | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c index b65eb050..3c0f3d4 100644 --- a/tools/perf/builtin-kvm.c +++ b/tools/perf/builtin-kvm.c @@ -1132,6 +1132,10 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv) "-m", "1024", "-c", "1", }; + const char * const kvm_stat_record_usage[] = { + "perf kvm stat record []", + NULL + }; const char * const *events_tp; events_tp_size = 0; @@ -1159,6 +1163,27 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv) for (j = 1; j < (unsigned int)argc; j++, i++) rec_argv[i] = argv[j]; + set_option_flag(record_options, 'e', "event", PARSE_OPT_HIDDEN); + set_option_flag(record_options, 0, "filter", PARSE_OPT_HIDDEN); + set_option_flag(record_options, 'R', "raw-samples", PARSE_OPT_HIDDEN); + + set_option_flag(record_options, 'F', "freq", PARSE_OPT_DISABLED); + set_option_flag(record_options, 0, "group", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'g', NULL, PARSE_OPT_DISABLED); + set_option_flag(record_options, 0, "call-graph", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'd', "data", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'T', "timestamp", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'P', "period", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'n', "no-samples", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'N', "no-buildid-cache", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'B', "no-buildid", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'G', "cgroup", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'b', "branch-any", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'j', "branch-filter", PARSE_OPT_DISABLED); + set_option_flag(record_options, 'W', "weight", PARSE_OPT_DISABLED); + set_option_flag(record_options, 0, "transaction", PARSE_OPT_DISABLED); + + record_usage = kvm_stat_record_usage; return cmd_record(i, rec_argv, NULL); } -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/