Adding --output-dir option to mimic -o and --dir options. following commands do the same:
$ perf record -o perf.dir.data --dir ... $ perf record --output-dir perf.dir.data ... User cannot use both -o and output-dir together, error is displayed. Link: http://lkml.kernel.org/n/tip-76ldd2ss6vjvlnjgwy7wx...@git.kernel.org Signed-off-by: Jiri Olsa <jo...@kernel.org> --- tools/lib/subcmd/parse-options.h | 4 ++++ tools/perf/Documentation/perf-record.txt | 3 +++ tools/perf/builtin-record.c | 13 +++++++++++-- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/tools/lib/subcmd/parse-options.h b/tools/lib/subcmd/parse-options.h index af9def589863..8a3be77a3346 100644 --- a/tools/lib/subcmd/parse-options.h +++ b/tools/lib/subcmd/parse-options.h @@ -146,6 +146,10 @@ struct option { .value = check_vtype(v, const char **), .argh = (a), .help = (h), \ .flags = PARSE_OPT_OPTARG, .defval = (intptr_t)(d), \ .set = check_vtype(os, bool *)} +#define OPT_STRING_SET(s, l, v, os, a, h) \ + { .type = OPTION_STRING, .short_name = (s), .long_name = (l), \ + .value = check_vtype(v, const char **), .argh = (a), .help = (h), \ + .set = check_vtype(os, bool *)} #define OPT_STRING_NOEMPTY(s, l, v, a, h) { .type = OPTION_STRING, .short_name = (s), .long_name = (l), .value = check_vtype(v, const char **), .argh = (a), .help = (h), .flags = PARSE_OPT_NOEMPTY} #define OPT_DATE(s, l, v, h) \ { .type = OPTION_CALLBACK, .short_name = (s), .long_name = (l), .value = (v), .argh = "time", .help = (h), .callback = parse_opt_approxidate_cb } diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt index 445b7a4eb130..aac609887fb7 100644 --- a/tools/perf/Documentation/perf-record.txt +++ b/tools/perf/Documentation/perf-record.txt @@ -527,6 +527,9 @@ Implies --tail-synthesize. --dir:: Store data into directory with one data file for cpu. +--output-dir:: +Same as --dir option, can't be used together with -o option. + SEE ALSO -------- linkperf:perf-stat[1], linkperf:perf-list[1] diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index 26981be13aa0..115316e94b34 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -80,6 +80,7 @@ struct record { bool buildid_all; bool timestamp_filename; bool timestamp_boundary; + bool output_is_file; struct switch_output switch_output; unsigned long long samples; cpu_set_t affinity_mask; @@ -1921,8 +1922,10 @@ static struct option __record_options[] = { OPT_STRING('C', "cpu", &record.opts.target.cpu_list, "cpu", "list of cpus to monitor"), OPT_U64('c', "count", &record.opts.user_interval, "event period to sample"), - OPT_STRING('o', "output", &record.data.path, "file", - "output file name"), + OPT_STRING_SET('o', "output", &record.data.path, &record.output_is_file, + "file", "output file name"), + OPT_STRING_SET(0, "output-dir", &record.data.path, &record.data.is_dir, + "file", "output directory name"), OPT_BOOLEAN_SET('i', "no-inherit", &record.opts.no_inherit, &record.opts.no_inherit_set, "child tasks do not inherit counters"), @@ -2101,6 +2104,12 @@ int cmd_record(int argc, const char **argv) "cgroup monitoring only available in system-wide mode"); } + + if (perf_data__is_dir(&rec->data) && record.output_is_file) { + ui__error("cannot use both -o and --output-dir\n"); + return -EINVAL; + } + if (rec->opts.record_switch_events && !perf_can_record_switch_events()) { ui__error("kernel does not support recording context switch events\n"); -- 2.17.2
