Next patches will add --switch-output option arguments, changing the option to allow that and adding its default value to 'signal'.
Signed-off-by: Jiri Olsa <[email protected]> Cc: David Ahern <[email protected]> Cc: Namhyung Kim <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Wang Nan <[email protected]> Link: http://lkml.kernel.org/n/[email protected] --- tools/perf/builtin-record.c | 24 ++++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f7e805b30527..b503e5ebc1e7 100644 --- a/tools/perf/builtin-record.c +++ b/tools/perf/builtin-record.c @@ -48,6 +48,8 @@ struct switch_output { bool signal; + const char *str; + bool set; }; struct record { @@ -1356,6 +1358,17 @@ static int record__parse_mmap_pages(const struct option *opt, return ret; } +static int switch_output_setup(struct switch_output *s) +{ + if (!strcmp(s->str, "signal")) { + s->signal = true; + pr_debug("switch-output with SIGUSR2 signal\n"); + return 0; + } + + return -1; +} + static const char * const __record_usage[] = { "perf record [<options>] [<command>]", "perf record [<options>] -- <command> [<options>]", @@ -1523,8 +1536,9 @@ static struct option __record_options[] = { "Record build-id of all DSOs regardless of hits"), OPT_BOOLEAN(0, "timestamp-filename", &record.timestamp_filename, "append timestamp to output filename"), - OPT_BOOLEAN(0, "switch-output", &record.switch_output.signal, - "Switch output when receive SIGUSR2"), + OPT_STRING_OPTARG_SET(0, "switch-output", &record.switch_output.str, + &record.switch_output.set, "signal", + "Switch output when receive SIGUSR2", "signal"), OPT_BOOLEAN(0, "dry-run", &dry_run, "Parse options then exit"), OPT_END() @@ -1582,6 +1596,12 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) return -EINVAL; } + if (record.switch_output.set && + switch_output_setup(&rec->switch_output)) { + parse_options_usage(record_usage, record_options, "switch-output", 0); + return -EINVAL; + } + if (rec->switch_output.signal) rec->timestamp_filename = true; -- 2.7.4
