mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Jiri Olsa <jolsa@kernel.org>
To: Arnaldo Carvalho de Melo <acme@kernel.org>
Cc: David Ahern <dsahern@gmail.com>,
	Namhyung Kim <namhyung@kernel.org>,
	Peter Zijlstra <a.p.zijlstra@chello.nl>,
	Wang Nan <wangnan0@huawei.com>,
	lkml <linux-kernel@vger.kernel.org>,
	Ingo Molnar <mingo@kernel.org>
Subject: [PATCH 5/7] perf record: Change switch-output option to take optional argument
Date: Tue,  3 Jan 2017 09:19:58 +0100	[thread overview]
Message-ID: <1483431600-19887-6-git-send-email-jolsa@kernel.org> (raw)
In-Reply-To: <1483431600-19887-1-git-send-email-jolsa@kernel.org>

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 <jolsa@kernel.org>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Wang Nan <wangnan0@huawei.com>
Link: http://lkml.kernel.org/n/tip-d3qy0tnc4m2dyt8yd6x5phyv@git.kernel.org
---
 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

  parent reply	other threads:[~2017-01-03  8:20 UTC|newest]

Thread overview: 23+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-03  8:19 [PATCH 0/7] perf tools: Add switch-output size and time threshold options Jiri Olsa
2017-01-03  8:19 ` [PATCH 1/7] tools lib subcmd: Add OPT_STRING_OPTARG_SET option Jiri Olsa
2017-01-05  7:51   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2017-01-03  8:19 ` [PATCH 2/7] perf record: Make __record_options static Jiri Olsa
2017-01-05  7:51   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2017-01-03  8:19 ` [PATCH 3/7] perf record: Fix --switch-output documentation and comment Jiri Olsa
2017-01-05  7:52   ` [tip:perf/urgent] " tip-bot for Jiri Olsa
2017-01-03  8:19 ` [PATCH 4/7] perf record: Add struct switch_output Jiri Olsa
2017-01-03  8:19 ` Jiri Olsa [this message]
2017-01-03  8:19 ` [PATCH 6/7] perf record: Add switch-output size option argument Jiri Olsa
2017-01-03 14:20   ` Arnaldo Carvalho de Melo
2017-01-03 14:21     ` Arnaldo Carvalho de Melo
2017-01-03 14:32     ` Jiri Olsa
2017-01-03 14:49       ` Arnaldo Carvalho de Melo
2017-01-03 15:33   ` David Ahern
2017-01-03 16:12     ` Arnaldo Carvalho de Melo
2017-01-03 16:23       ` David Ahern
2017-01-03 19:42         ` Jiri Olsa
2017-01-03  8:20 ` [PATCH 7/7] perf record: Add switch-output time " Jiri Olsa
2017-01-03  9:51 ` [PATCH 0/7] perf tools: Add switch-output size and time threshold options Wangnan (F)
2017-01-03 10:39   ` Jiri Olsa
2017-01-10 13:35   ` Arnaldo Carvalho de Melo
2017-01-10 18:40     ` Jiri Olsa

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1483431600-19887-6-git-send-email-jolsa@kernel.org \
    --to=jolsa@kernel.org \
    --cc=a.p.zijlstra@chello.nl \
    --cc=acme@kernel.org \
    --cc=dsahern@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=mingo@kernel.org \
    --cc=namhyung@kernel.org \
    --cc=wangnan0@huawei.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®