From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751288AbdALIdM (ORCPT ); Thu, 12 Jan 2017 03:33:12 -0500 Received: from terminus.zytor.com ([198.137.202.10]:35090 "EHLO terminus.zytor.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750859AbdALIdK (ORCPT ); Thu, 12 Jan 2017 03:33:10 -0500 Date: Thu, 12 Jan 2017 00:32:34 -0800 From: tip-bot for Jiri Olsa Message-ID: Cc: mingo@kernel.org, namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, dsahern@gmail.com, linux-kernel@vger.kernel.org, jolsa@kernel.org, a.p.zijlstra@chello.nl, tglx@linutronix.de, hpa@zytor.com Reply-To: namhyung@kernel.org, acme@redhat.com, wangnan0@huawei.com, mingo@kernel.org, hpa@zytor.com, tglx@linutronix.de, a.p.zijlstra@chello.nl, linux-kernel@vger.kernel.org, jolsa@kernel.org, dsahern@gmail.com In-Reply-To: <1483955520-29063-4-git-send-email-jolsa@kernel.org> References: <1483955520-29063-4-git-send-email-jolsa@kernel.org> To: linux-tip-commits@vger.kernel.org Subject: [tip:perf/core] perf record: Change switch-output option to take optional argument Git-Commit-ID: cb4e1ebb6a398ff5b0067034b0d16566af4d78e8 X-Mailer: tip-git-log-daemon Robot-ID: Robot-Unsubscribe: Contact to get blacklisted from these emails MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset=UTF-8 Content-Disposition: inline Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Commit-ID: cb4e1ebb6a398ff5b0067034b0d16566af4d78e8 Gitweb: http://git.kernel.org/tip/cb4e1ebb6a398ff5b0067034b0d16566af4d78e8 Author: Jiri Olsa AuthorDate: Mon, 9 Jan 2017 10:51:57 +0100 Committer: Arnaldo Carvalho de Melo CommitDate: Wed, 11 Jan 2017 16:48:01 -0300 perf record: Change switch-output option to take optional argument 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 Acked-by: Wang Nan Tested-by: Arnaldo Carvalho de Melo Cc: David Ahern Cc: Namhyung Kim Cc: Peter Zijlstra Link: http://lkml.kernel.org/r/1483955520-29063-4-git-send-email-jolsa@kernel.org Signed-off-by: Arnaldo Carvalho de Melo --- tools/perf/builtin-record.c | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c index f7e805b..2bf811a 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,22 @@ out_free: return ret; } +static int switch_output_setup(struct record *rec) +{ + struct switch_output *s = &rec->switch_output; + + if (!s->set) + return 0; + + 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 [] []", "perf record [] -- []", @@ -1523,8 +1541,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 +1601,11 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused) return -EINVAL; } + if (switch_output_setup(rec)) { + parse_options_usage(record_usage, record_options, "switch-output", 0); + return -EINVAL; + } + if (rec->switch_output.signal) rec->timestamp_filename = true;