diff options
Diffstat (limited to '')
-rw-r--r-- | tools/perf/builtin-data.c | 94 |
1 files changed, 44 insertions, 50 deletions
diff --git a/tools/perf/builtin-data.c b/tools/perf/builtin-data.c index 8d23b8d6ee8e..ce51cbf6dc97 100644 --- a/tools/perf/builtin-data.c +++ b/tools/perf/builtin-data.c @@ -3,11 +3,10 @@ #include <stdio.h> #include <string.h> #include "builtin.h" -#include "perf.h" #include "debug.h" #include <subcmd/parse-options.h> #include "data-convert.h" -#include "data-convert-bt.h" +#include "util/util.h" typedef int (*data_cmd_fn_t)(int argc, const char **argv); @@ -22,47 +21,24 @@ 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_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"), #ifdef HAVE_LIBBABELTRACE_SUPPORT OPT_STRING(0, "to-ctf", &to_ctf, NULL, "Convert to CTF format"), OPT_BOOLEAN(0, "tod", &opts.tod, "Convert time to wall clock time"), @@ -72,23 +48,43 @@ static int cmd_data_convert(int argc, const char **argv) OPT_END() }; -#ifndef HAVE_LIBBABELTRACE_SUPPORT - pr_err("No conversion support compiled in. perf should be compiled with environment variables LIBBABELTRACE=1 and LIBBABELTRACE_DIR=/path/to/libbabeltrace/\n"); - return -1; -#endif +static int cmd_data_convert(int argc, const char **argv) +{ - argc = parse_options(argc, argv, options, - data_convert_usage, 0); + 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; } - if (to_ctf) { + if (to_json && to_ctf) { + pr_err("You cannot specify both --to-ctf and --to-json.\n"); + return -1; + } #ifdef HAVE_LIBBABELTRACE_SUPPORT + if (!to_json && !to_ctf) { + pr_err("You must specify one of --to-ctf or --to-json.\n"); + return -1; + } +#else + if (!to_json) { + pr_err("You must specify --to-json.\n"); + return -1; +} +#endif + + if (to_json) + return bt_convert__perf2json(input_name, to_json, &opts); + + if (to_ctf) { +#if defined(HAVE_LIBBABELTRACE_SUPPORT) && defined(HAVE_LIBTRACEEVENT) return bt_convert__perf2ctf(input_name, to_ctf, &opts); #else - pr_err("The libbabeltrace support is not compiled in.\n"); + pr_err("The libbabeltrace support is not compiled in. perf should be " + "compiled with environment variables LIBBABELTRACE=1 and " + "LIBBABELTRACE_DIR=/path/to/libbabeltrace/.\n" + "Check also if libbtraceevent devel files are available.\n"); return -1; #endif } @@ -106,14 +102,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]; @@ -125,7 +120,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; } |