lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Date:	Mon,  6 Oct 2014 20:13:18 +0400
From:	Alexander Yarygin <yarygin@...ux.vnet.ibm.com>
To:	linux-kernel@...r.kernel.org
Cc:	Alexander Yarygin <yarygin@...ux.vnet.ibm.com>,
	Arnaldo Carvalho de Melo <acme@...nel.org>,
	Christian Borntraeger <borntraeger@...ibm.com>,
	David Ahern <dsahern@...il.com>,
	Ingo Molnar <mingo@...nel.org>, Jiri Olsa <jolsa@...hat.com>,
	Paul Mackerras <paulus@...ba.org>,
	Peter Zijlstra <a.p.zijlstra@...llo.nl>,
	Arnaldo Carvalho de Melo <acme@...hat.com>
Subject: [PATCH] perf kvm stat record: 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.

Signed-off-by: Alexander Yarygin <yarygin@...ux.vnet.ibm.com>
Cc: Arnaldo Carvalho de Melo <acme@...hat.com>
Cc: Christian Borntraeger <borntraeger@...ibm.com>
Cc: David Ahern <dsahern@...il.com>
Cc: Ingo Molnar <mingo@...nel.org>
Cc: Jiri Olsa <jolsa@...hat.com>
Cc: Paul Mackerras <paulus@...ba.org>
Cc: Peter Zijlstra <a.p.zijlstra@...llo.nl>
---
 tools/perf/builtin-kvm.c | 38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/tools/perf/builtin-kvm.c b/tools/perf/builtin-kvm.c
index 43367eb..0c169d7 100644
--- a/tools/perf/builtin-kvm.c
+++ b/tools/perf/builtin-kvm.c
@@ -1138,6 +1138,40 @@ exit:
 		_p;			\
 	})
 
+static void print_record_help(void)
+{
+	fprintf(stderr, "\n usage: perf kvm stat record [<options>]\n\n");
+
+	fprintf(stderr, "    -p, --pid <pid>      record events on existing process id\n");
+	fprintf(stderr, "    -t, --tid <tid>      record events on existing thread id\n");
+	fprintf(stderr, "    -r, --realtime <n>   collect data with this RT SCHED_FIFO priority\n");
+	fprintf(stderr, "        --no-buffering   collect data without buffering\n");
+	fprintf(stderr, "    -a, --all-cpus       system-wide collection from all CPUs\n");
+	fprintf(stderr, "    -C, --cpu <cpu>      list of cpus to monitor\n");
+	fprintf(stderr, "    -c, --count <n>      event period to sample\n");
+	fprintf(stderr, "    -o, --output <file>  output file name\n");
+	fprintf(stderr, "    -i, --no-inherit     child tasks do not inherit counters\n");
+	fprintf(stderr, "    -m, --mmap-pages <pages>\n");
+	fprintf(stderr, "                         number of mmap data pages\n");
+	fprintf(stderr, "    -v, --verbose        be more verbose (show counter open errors, etc)\n");
+	fprintf(stderr, "    -q, --quiet          don't print any message\n");
+	fprintf(stderr, "    -D, --delay <n>      ms to wait before starting measurement after program start\n");
+	fprintf(stderr, "    -u, --uid <user>     user to profile\n");
+	fprintf(stderr, "        --per-thread     use per-thread mmaps\n");
+
+	fprintf(stderr, "\nOtherwise, it is the alias of 'perf record:'\n");
+}
+
+static bool is_help_option(int argc, const char **argv)
+{
+	int i;
+
+	for (i = 0; i < argc; i++)
+		if (!strcmp(argv[i], "--help") || !strcmp(argv[i], "-h"))
+			return true;
+	return false;
+}
+
 static int
 kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
 {
@@ -1150,6 +1184,10 @@ kvm_events_record(struct perf_kvm_stat *kvm, int argc, const char **argv)
 		"-c", "1",
 	};
 	const char * const *events_tp;
+
+	if (argc == 1 || (argc > 1 && is_help_option(argc, argv)))
+		print_record_help();
+
 	events_tp_size = 0;
 
 	for (events_tp = kvm_events_tp; *events_tp; events_tp++)
-- 
1.9.1

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Powered by blists - more mailing lists