linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Wang Nan <wangnan0@huawei.com>
To: Alexei Starovoitov <ast@kernel.org>,
	Arnaldo Carvalho de Melo <acme@redhat.com>,
	Arnaldo Carvalho de Melo <acme@kernel.org>,
	Brendan Gregg <brendan.d.gregg@gmail.com>
Cc: "Adrian Hunter" <adrian.hunter@intel.com>,
	"Cody P Schafer" <dev@codyps.com>,
	"David S. Miller" <davem@davemloft.net>,
	"He Kuang" <hekuang@huawei.com>,
	"Jérémie Galarneau" <jeremie.galarneau@efficios.com>,
	"Jiri Olsa" <jolsa@kernel.org>,
	"Kirill Smelkov" <kirr@nexedi.com>,
	"Li Zefan" <lizefan@huawei.com>,
	"Masami Hiramatsu" <masami.hiramatsu.pt@hitachi.com>,
	"Namhyung Kim" <namhyung@kernel.org>,
	"Peter Zijlstra" <peterz@infradead.org>,
	pi3orama@163.com, "Wang Nan" <wangnan0@huawei.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH 32/54] perf record: Split output into multiple files via '--switch-output'
Date: Fri, 5 Feb 2016 14:01:57 +0000	[thread overview]
Message-ID: <1454680939-24963-33-git-send-email-wangnan0@huawei.com> (raw)
In-Reply-To: <1454680939-24963-1-git-send-email-wangnan0@huawei.com>

Allow 'perf record' splits its output into multiple files.

For example:

 # ~/perf record -a --timestamp-filename --switch-output &
 [1] 10763
 # kill -s SIGUSR2 10763
 [ perf record: dump data: Woken up 1 times ]
 # [ perf record: Dump perf.data.2015122622314468 ]

 # kill -s SIGUSR2 10763
 [ perf record: dump data: Woken up 1 times ]
 # [ perf record: Dump perf.data.2015122622314762 ]

 # kill -s SIGUSR2 10763
 [ perf record: dump data: Woken up 1 times ]
 #[ perf record: Dump perf.data.2015122622315171 ]

 # fg
 perf record -a --timestamp-filename --switch-output
 ^C[ perf record: Woken up 1 times to write data ]
 [ perf record: Dump perf.data.2015122622315513 ]
 [ perf record: Captured and wrote 0.014 MB perf.data (296 samples) ]

 # ls -l
 total 920
 -rw------- 1 root root 797692 Dec 26 22:31 perf.data.2015122622314468
 -rw------- 1 root root  59960 Dec 26 22:31 perf.data.2015122622314762
 -rw------- 1 root root  59912 Dec 26 22:31 perf.data.2015122622315171
 -rw------- 1 root root  19220 Dec 26 22:31 perf.data.2015122622315513

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Signed-off-by: He Kuang <hekuang@huawei.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Jiri Olsa <jolsa@kernel.org>
Cc: Masami Hiramatsu <masami.hiramatsu.pt@hitachi.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
---
 tools/perf/builtin-record.c | 34 ++++++++++++++++++++++++++++------
 1 file changed, 28 insertions(+), 6 deletions(-)

diff --git a/tools/perf/builtin-record.c b/tools/perf/builtin-record.c
index a561599..4e03a20 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -55,6 +55,7 @@ struct record {
 	bool			no_buildid_cache_set;
 	bool			buildid_all;
 	bool			timestamp_filename;
+	bool			switch_output;
 	unsigned long long	samples;
 };
 
@@ -163,6 +164,7 @@ auxtrace_snapshot_is_enabled(void)
 
 static volatile int auxtrace_snapshot_err;
 static volatile int auxtrace_record__snapshot_started;
+static volatile int switch_output_started;
 
 static void sig_handler(int sig)
 {
@@ -672,7 +674,7 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 	signal(SIGINT, sig_handler);
 	signal(SIGTERM, sig_handler);
 
-	if (rec->opts.auxtrace_snapshot_mode) {
+	if (rec->opts.auxtrace_snapshot_mode || rec->switch_output) {
 		signal(SIGUSR2, snapshot_sig_handler);
 		auxtrace_snapshot_on();
 	} else {
@@ -824,9 +826,25 @@ static int __cmd_record(struct record *rec, int argc, const char **argv)
 			}
 		}
 
+		if (switch_output_started) {
+			switch_output_started = 0;
+
+			if (!quiet)
+				fprintf(stderr, "[ perf record: dump data: Woken up %ld times ]\n",
+					waking);
+			waking = 0;
+			fd = record__switch_output(rec, false);
+			if (fd < 0) {
+				pr_err("Failed to switch to new file\n");
+				err = fd;
+				goto out_child;
+			}
+		}
+
 		if (hits == rec->samples) {
 			if (done || draining)
 				break;
+
 			err = perf_evlist__poll(rec->evlist, -1);
 			/*
 			 * Propagate error, only if there's any. Ignore positive
@@ -1274,6 +1292,8 @@ 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,
+		    "Switch output when receive SIGUSR2"),
 	OPT_END()
 };
 
@@ -1414,9 +1434,11 @@ out_symbol_exit:
 
 static void snapshot_sig_handler(int sig __maybe_unused)
 {
-	if (!auxtrace_snapshot_is_enabled())
-		return;
-	auxtrace_snapshot_disable();
-	auxtrace_snapshot_err = auxtrace_record__snapshot_start(record.itr);
-	auxtrace_record__snapshot_started = 1;
+	if (auxtrace_snapshot_is_enabled()) {
+		auxtrace_snapshot_disable();
+		auxtrace_snapshot_err = auxtrace_record__snapshot_start(record.itr);
+		auxtrace_record__snapshot_started = 1;
+	}
+
+	switch_output_started = 1;
 }
-- 
1.8.3.4

  parent reply	other threads:[~2016-02-05 14:10 UTC|newest]

Thread overview: 75+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-02-05 14:01 [PATCH 00/54] perf tools: Bugfix, BPF improvements and overwrite ring buffer support Wang Nan
2016-02-05 14:01 ` [PATCH 01/54] perf tools: Fix dangling pointers in parse_events__free_terms Wang Nan
2016-02-16  7:53   ` [tip:perf/core] perf tools: Unlink entries from terms list tip-bot for Wang Nan
2016-02-16  7:54   ` [tip:perf/core] perf tools: Free the terms list_head in parse_events__free_terms() tip-bot for Wang Nan
2016-02-05 14:01 ` [PATCH 02/54] perf tools: Fix symbols searching for offline module in buildid-cache Wang Nan
2016-02-16  7:52   ` [tip:perf/core] perf symbols: Fix symbols searching for " tip-bot for Wang Nan
2016-02-05 14:01 ` [PATCH 03/54] perf tools: Record text offset in dso to calculate objdump address Wang Nan
2016-02-05 14:01 ` [PATCH 04/54] perf tools: Adjust symbol for shared objects Wang Nan
2016-02-05 14:01 ` [PATCH 05/54] perf data: Fix releasing event_class Wang Nan
     [not found]   ` <20160211220413.GF32168@kernel.org>
2016-02-12 12:19     ` Jiri Olsa
2016-02-12 15:42       ` Arnaldo Carvalho de Melo
2016-02-16  7:55   ` [tip:perf/core] " tip-bot for Wang Nan
2016-02-05 14:01 ` [PATCH 06/54] perf tools: Add API to config maps in bpf object Wang Nan
2016-02-05 14:01 ` [PATCH 07/54] perf tools: Enable BPF object configure syntax Wang Nan
2016-02-12 14:09   ` Jiri Olsa
2016-02-18  6:17     ` Wangnan (F)
2016-02-05 14:01 ` [PATCH 08/54] perf record: Apply config to BPF objects before recording Wang Nan
2016-02-12 20:55   ` Arnaldo Carvalho de Melo
2016-02-05 14:01 ` [PATCH 09/54] perf tools: Enable passing event to BPF object Wang Nan
2016-02-12 14:05   ` Jiri Olsa
2016-02-05 14:01 ` [PATCH 10/54] perf stat: Forbid user passing improper config terms Wang Nan
2016-02-12 13:49   ` Jiri Olsa
2016-02-12 15:45     ` Arnaldo Carvalho de Melo
2016-02-12 15:50       ` Jiri Olsa
2016-02-05 14:01 ` [PATCH 11/54] perf tools: Rename and move pmu_event_name to get_config_name Wang Nan
2016-02-05 14:01 ` [PATCH 12/54] perf tools: Enable config raw and numeric events Wang Nan
2016-02-12 13:52   ` Jiri Olsa
2016-02-12 13:56     ` pi3orama
2016-02-12 13:56     ` Jiri Olsa
2016-02-12 14:10   ` Jiri Olsa
2016-02-12 14:12   ` Jiri Olsa
2016-02-05 14:01 ` [PATCH 13/54] perf tools: Enable config and setting names for legacy cache events Wang Nan
2016-02-05 14:01 ` [PATCH 14/54] perf tools: Support setting different slots in a BPF map separately Wang Nan
2016-02-12 14:23   ` Jiri Olsa
2016-02-12 14:34     ` pi3orama
2016-02-05 14:01 ` [PATCH 15/54] perf tools: Enable indices setting syntax for BPF maps Wang Nan
2016-02-05 14:01 ` [PATCH 16/54] perf tools: Pass tracepoint options to BPF script Wang Nan
2016-02-05 14:01 ` [PATCH 17/54] perf tools: Introduce bpf-output event Wang Nan
2016-02-05 14:01 ` [PATCH 18/54] perf data: Support converting data from bpf_perf_event_output() Wang Nan
2016-02-05 14:01 ` [PATCH 19/54] perf core: Introduce new ioctl options to pause and resume ring buffer Wang Nan
2016-02-05 14:01 ` [PATCH 20/54] perf core: Set event's default overflow_handler Wang Nan
2016-02-05 14:01 ` [PATCH 21/54] perf core: Prepare writing into ring buffer from end Wang Nan
2016-02-05 14:01 ` [PATCH 22/54] perf core: Add backward attribute to perf event Wang Nan
2016-02-05 14:01 ` [PATCH 23/54] perf core: Reduce perf event output overhead by new overflow handler Wang Nan
2016-02-05 14:01 ` [PATCH 24/54] perf tools: Only validate is_pos for tracking evsels Wang Nan
2016-02-05 14:01 ` [PATCH 25/54] perf tools: Print write_backward value in perf_event_attr__fprintf Wang Nan
2016-02-05 14:01 ` [PATCH 26/54] perf tools: Make ordered_events reusable Wang Nan
2016-02-05 14:01 ` [PATCH 27/54] perf record: Extract synthesize code to record__synthesize() Wang Nan
2016-02-05 14:01 ` [PATCH 28/54] perf tools: Add perf_data_file__switch() helper Wang Nan
2016-02-05 14:01 ` [PATCH 29/54] perf record: Turns auxtrace_snapshot_enable into 3 states Wang Nan
2016-02-05 14:01 ` [PATCH 30/54] perf record: Introduce record__finish_output() to finish a perf.data Wang Nan
2016-02-05 14:01 ` [PATCH 31/54] perf record: Add '--timestamp-filename' option to append timestamp to output filename Wang Nan
2016-02-05 14:01 ` Wang Nan [this message]
2016-02-05 14:01 ` [PATCH 33/54] perf record: Force enable --timestamp-filename when --switch-output is provided Wang Nan
2016-02-05 14:01 ` [PATCH 34/54] perf record: Disable buildid cache options by default in switch output mode Wang Nan
2016-02-05 14:02 ` [PATCH 35/54] perf record: Re-synthesize tracking events after output switching Wang Nan
2016-02-05 14:02 ` [PATCH 36/54] perf record: Generate tracking events for process forked by perf Wang Nan
2016-02-05 14:02 ` [PATCH 37/54] perf record: Ensure return non-zero rc when mmap fail Wang Nan
2016-02-05 14:02 ` [PATCH 38/54] perf record: Prevent reading invalid data in record__mmap_read Wang Nan
2016-02-05 14:02 ` [PATCH 39/54] perf tools: Add evlist channel helpers Wang Nan
2016-02-05 14:02 ` [PATCH 40/54] perf tools: Automatically add new channel according to evlist Wang Nan
2016-02-05 14:02 ` [PATCH 41/54] perf tools: Operate multiple channels Wang Nan
2016-02-05 14:02 ` [PATCH 42/54] perf tools: Squash overwrite setting into channel Wang Nan
2016-02-05 14:02 ` [PATCH 43/54] perf record: Don't read from and poll overwrite channel Wang Nan
2016-02-05 14:02 ` [PATCH 44/54] perf record: Don't poll on " Wang Nan
2016-02-05 14:02 ` [PATCH 45/54] perf tools: Detect avalibility of write_backward Wang Nan
2016-02-05 14:02 ` [PATCH 46/54] perf tools: Enable overwrite settings Wang Nan
2016-02-05 14:02 ` [PATCH 47/54] perf tools: Set write_backward attribut bit for overwrite events Wang Nan
2016-02-05 14:02 ` [PATCH 48/54] perf tools: Record fd into perf_mmap Wang Nan
2016-02-05 14:02 ` [PATCH 49/54] perf tools: Add API to pause a channel Wang Nan
2016-02-05 14:02 ` [PATCH 50/54] perf record: Toggle overwrite ring buffer for reading Wang Nan
2016-02-05 14:02 ` [PATCH 51/54] perf record: Rename variable to make code clear Wang Nan
2016-02-05 14:02 ` [PATCH 52/54] perf record: Read from backward ring buffer Wang Nan
2016-02-05 14:02 ` [PATCH 53/54] perf record: Allow generate tracking events at the end of output Wang Nan
2016-02-05 14:02 ` [PATCH 54/54] perf tools: Don't warn about out of order event if write_backward is used Wang Nan

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=1454680939-24963-33-git-send-email-wangnan0@huawei.com \
    --to=wangnan0@huawei.com \
    --cc=acme@kernel.org \
    --cc=acme@redhat.com \
    --cc=adrian.hunter@intel.com \
    --cc=ast@kernel.org \
    --cc=brendan.d.gregg@gmail.com \
    --cc=davem@davemloft.net \
    --cc=dev@codyps.com \
    --cc=hekuang@huawei.com \
    --cc=jeremie.galarneau@efficios.com \
    --cc=jolsa@kernel.org \
    --cc=kirr@nexedi.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=lizefan@huawei.com \
    --cc=masami.hiramatsu.pt@hitachi.com \
    --cc=namhyung@kernel.org \
    --cc=peterz@infradead.org \
    --cc=pi3orama@163.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;
as well as URLs for NNTP newsgroup(s).