perf tool: save cmdline from user in file header vs what is passed to record
PATCH 1/1 perf tool: save cmdline from user in file header vs what is passed to record
A number of builtin commands process some user args and then pass the rest to cmd_record. cmd_record then saves argc/argv that it receives into the header of the perf data file. But this loses the arguments handled by the first command -- ie., the real command line from the user. This patch saves the command line as typed by the user rather than what was passed to cmd_record.
As an example consider the command:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record
-fo /tmp/perf.data -ag -- sleep 10Currently the command saved to the header is:
cmdline : /tmp/p3.5/perf record -o perf.data.kvm -fo /tmp/perf.data -ag -- sleep 1
(ignore the duplicated -o -- the first would be yet another bug with perf-kvm).
With this patch the command line saved to the header is:
cmdline : /tmp/p3.5/perf kvm --guest --host --guestmount=/tmp/guest-mount
record -fo /tmp/perf.data -ag -- sleep 1
v2: simplified to saving the command in parse_options per Stephane's suggestion
--- tools/perf/builtin-record.c | 2 -- tools/perf/util/header.c | 9 +++++++++ tools/perf/util/parse-options.c | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +0 -2
@@ -844,8 +844,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)struct perf_record *rec = &record;char errbuf[BUFSIZ ]; -perf_header__set_cmdline (argc, argv); - evsel_list =perf_evlist__new (NULL ,NULL );if (evsel_list ==NULL )return -ENOMEM ;
tools/perf/util/header.c +9 -0
@@ -174,6 +174,15 @@ perf_header__set_cmdline(int argc, const char **argv) {int i; +/* +* If header_argv has already been set, do not override it. +* This allows a command to set the cmdline, parse args and +* then call another builtin function that implements a +* command -- e.g, cmd_kvm calling cmd_record. +*/ +if (header_argv) +return 0 ; + header_argc = (u32 )argc;/* do not include NULL termination */
tools/perf/util/parse-options.c +3 -0
@@ -1,6 +1,7 @@#include "util.h" #include "parse-options.h" #include "cache.h" +#include "header.h" #define OPT_SHORT 1#define OPT_UNSET 2
@@ -413,6 +414,8 @@ int parse_options(int argc, const char **argv, const struct option *options, {struct parse_opt_ctx_t ctx; +perf_header__set_cmdline (argc, argv); +parse_options_start (&ctx, argc, argv, flags);switch (parse_options_step (&ctx, options, usagestr)) {case PARSE_OPT_HELP :
Signature · 1 line
1.7.10.1
[tip:perf/urgent] perf tool: Save cmdline from user in file header vs what is passed to record
Commit-ID: 56e6f602aa4432f7fe90a0d9ba379b2735b07b6b Gitweb: http://git.kernel.org/tip/56e6f602aa4432f7fe90a0d9ba379b2735b07b6b Author: David Ahern <[email protected]> AuthorDate: Sun, 29 Jul 2012 20:53:51 -0600 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Fri, 3 Aug 2012 10:33:50 -0300
perf tool: Save cmdline from user in file header vs what is passed to record
A number of builtin commands process some user args and then pass the rest to cmd_record. cmd_record then saves argc/argv that it receives into the header of the perf data file. But this loses the arguments handled by the first command -- ie., the real command line from the user. This patch saves the command line as typed by the user rather than what was passed to cmd_record.
As an example consider the command:
$ perf kvm --guest --host --guestmount=/tmp/guest-mount record
-fo /tmp/perf.data -ag -- sleep 10Currently the command saved to the header is:
cmdline : /tmp/p3.5/perf record -o perf.data.kvm -fo /tmp/perf.data -ag -- sleep 1
(ignore the duplicated -o -- the first would be yet another bug with perf-kvm).
With this patch the command line saved to the header is:
cmdline : /tmp/p3.5/perf kvm --guest --host --guestmount=/tmp/guest-mount
record -fo /tmp/perf.data -ag -- sleep 1
v2: simplified to saving the command in parse_options per Stephane's suggestion
--- tools/perf/builtin-record.c | 2 -- tools/perf/util/header.c | 9 +++++++++ tools/perf/util/parse-options.c | 3 +++ 3 files changed, 12 insertions(+), 2 deletions(-)
tools/perf/builtin-record.c +0 -2
@@ -844,8 +844,6 @@ int cmd_record(int argc, const char **argv, const char *prefix __used)struct perf_record *rec = &record;char errbuf[BUFSIZ ]; -perf_header__set_cmdline (argc, argv); - evsel_list =perf_evlist__new (NULL ,NULL );if (evsel_list ==NULL )return -ENOMEM ;
tools/perf/util/header.c +9 -0
@@ -174,6 +174,15 @@ perf_header__set_cmdline(int argc, const char **argv) {int i; +/* +* If header_argv has already been set, do not override it. +* This allows a command to set the cmdline, parse args and +* then call another builtin function that implements a +* command -- e.g, cmd_kvm calling cmd_record. +*/ +if (header_argv) +return 0 ; + header_argc = (u32 )argc;/* do not include NULL termination */
tools/perf/util/parse-options.c +3 -0
@@ -1,6 +1,7 @@#include "util.h" #include "parse-options.h" #include "cache.h" +#include "header.h" #define OPT_SHORT 1#define OPT_UNSET 2
@@ -413,6 +414,8 @@ int parse_options(int argc, const char **argv, const struct option *options, {struct parse_opt_ctx_t ctx; +perf_header__set_cmdline (argc, argv); +parse_options_start (&ctx, argc, argv, flags);switch (parse_options_step (&ctx, options, usagestr)) {case PARSE_OPT_HELP :