* [PATCH] perf data: Correct -h output.
@ 2021-08-24 20:58 Ian Rogers
2021-08-30 21:28 ` Arnaldo Carvalho de Melo
0 siblings, 1 reply; 2+ messages in thread
From: Ian Rogers @ 2021-08-24 20:58 UTC (permalink / raw)
To: Peter Zijlstra, Ingo Molnar, Arnaldo Carvalho de Melo,
Mark Rutland, Alexander Shishkin, Jiri Olsa, Namhyung Kim,
Joshua Martinez, linux-perf-users, linux-kernel
Cc: eranian, Joshua Martinez, Ian Rogers
From: Joshua Martinez <joshuamart@google.com>
There is currently only 1 perf data command, but supporting extra
commands was breaking the help output. Simplify for now so that the help
output is correct.
Before:
$ perf data -h
Usage: perf data [<common options>] <command> [<options>]
$ perf data
Usage:
perf data [<common options>] <command> [<options>]
Available commands:
convert - converts data file between formats
After:
$ perf data
Usage: perf data convert [<options>]
-f, --force don't complain, do it
-i, --input <file> input file name
-v, --verbose be more verbose
--all Convert all events
--to-ctf ... Convert to CTF format
--to-json ... Convert to JSON format
--tod Convert time to wall clock time
$ perf data -h
Usage: perf data convert [<options>]
-f, --force don't complain, do it
-i, --input <file> input file name
-v, --verbose be more verbose
--all Convert all events
--to-ctf ... Convert to CTF format
--to-json ... Convert to JSON format
--tod Convert time to wall clock time
Signed-off-by: Joshua Martinez <joshuamart@google.com>
Signed-off-by: Ian Rogers <irogers@google.com>
---
tools/perf/builtin-data.c | 62 ++++++++++++---------------------------
1 file changed, 19 insertions(+), 43 deletions(-)
diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c
index 15ca23675ef0..b7f9dc85a407 100644
--- a/tools/perf/builtin-data.c
+++ b/tools/perf/builtin-data.c
@@ -21,46 +21,21 @@ static struct data_cmd data_cmds[];
#define for_each_cmd(cmd) \
for (cmd = data_cmds; cmd && cmd->name; cmd++)
-static const struct option data_options[] = {
- OPT_END()
-};
-
static const char * const data_subcommands[] = { "convert", NULL };
static const char *data_usage[] = {
- "perf data [<common options>] <command> [<options>]",
+ "perf data convert [<options>]",
NULL
};
-static void print_usage(void)
-{
- struct data_cmd *cmd;
-
- printf("Usage:\n");
- printf("\t%s\n\n", data_usage[0]);
- printf("\tAvailable commands:\n");
-
- for_each_cmd(cmd) {
- printf("\t %s\t- %s\n", cmd->name, cmd->summary);
- }
-
- printf("\n");
-}
-
-static const char * const data_convert_usage[] = {
- "perf data convert [<options>]",
- NULL
+const char *to_json;
+const char *to_ctf;
+struct perf_data_convert_opts opts = {
+ .force = false,
+ .all = false,
};
-static int cmd_data_convert(int argc, const char **argv)
-{
- const char *to_json = NULL;
- const char *to_ctf = NULL;
- struct perf_data_convert_opts opts = {
- .force = false,
- .all = false,
- };
- const struct option options[] = {
+const struct option data_options[] = {
OPT_INCR('v', "verbose", &verbose, "be more verbose"),
OPT_STRING('i', "input", &input_name, "file", "input file name"),
OPT_STRING(0, "to-json", &to_json, NULL, "Convert to JSON format"),
@@ -73,10 +48,13 @@ static int cmd_data_convert(int argc, const char **argv)
OPT_END()
};
- argc = parse_options(argc, argv, options,
- data_convert_usage, 0);
+static int cmd_data_convert(int argc, const char **argv)
+{
+
+ argc = parse_options(argc, argv, data_options,
+ data_usage, 0);
if (argc) {
- usage_with_options(data_convert_usage, options);
+ usage_with_options(data_usage, data_options);
return -1;
}
@@ -116,14 +94,13 @@ int cmd_data(int argc, const char **argv)
struct data_cmd *cmd;
const char *cmdstr;
- /* No command specified. */
- if (argc < 2)
- goto usage;
-
argc = parse_options_subcommand(argc, argv, data_options, data_subcommands, data_usage,
PARSE_OPT_STOP_AT_NON_OPTION);
- if (argc < 1)
- goto usage;
+
+ if (!argc) {
+ usage_with_options(data_usage, data_options);
+ return -1;
+ }
cmdstr = argv[0];
@@ -135,7 +112,6 @@ int cmd_data(int argc, const char **argv)
}
pr_err("Unknown command: %s\n", cmdstr);
-usage:
- print_usage();
+ usage_with_options(data_usage, data_options);
return -1;
}
--
2.33.0.rc2.250.ged5fa647cd-goog
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] perf data: Correct -h output.
2021-08-24 20:58 [PATCH] perf data: Correct -h output Ian Rogers
@ 2021-08-30 21:28 ` Arnaldo Carvalho de Melo
0 siblings, 0 replies; 2+ messages in thread
From: Arnaldo Carvalho de Melo @ 2021-08-30 21:28 UTC (permalink / raw)
To: Ian Rogers
Cc: Peter Zijlstra, Ingo Molnar, Mark Rutland, Alexander Shishkin,
Jiri Olsa, Namhyung Kim, Joshua Martinez, linux-perf-users,
linux-kernel, eranian, Joshua Martinez
Em Tue, Aug 24, 2021 at 01:58:29PM -0700, Ian Rogers escreveu:
> From: Joshua Martinez <joshuamart@google.com>
>
> There is currently only 1 perf data command, but supporting extra
> commands was breaking the help output. Simplify for now so that the help
> output is correct.
>
> Before:
> $ perf data -h
Thanks, applied.
- Arnaldo
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-08-30 21:28 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-08-24 20:58 [PATCH] perf data: Correct -h output Ian Rogers
2021-08-30 21:28 ` Arnaldo Carvalho de Melo
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.