Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1391212

[PATCH 09/13] perf record: Force enable --timestamp-filename when --switch-output is provided

Show all headers | View raw

From: Wang Nan <wangnan0@huawei.com>

Without this patch, the last output doesn't have timestamp appended if
--timestamp-filename is not explicitly provided. For example:

  # perf record -a --switch-output &
  [1] 11224
  # kill -s SIGUSR2 11224
  [ perf record: dump data: Woken up 1 times ]
  # [ perf record: Dump perf.data.2015122622372823 ]

  # fg
  perf record -a --switch-output
  ^C[ perf record: Woken up 1 times to write data ]
  [ perf record: Captured and wrote 0.027 MB perf.data (540 samples) ]

  # ls -l
  total 836
  -rw------- 1 root root  33256 Dec 26 22:37 perf.data   <---- *Odd*
  -rw------- 1 root root 817156 Dec 26 22:37 perf.data.2015122622372823

Signed-off-by: Wang Nan <wangnan0@huawei.com>
Tested-by: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Adrian Hunter <adrian.hunter@intel.com>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Masami Hiramatsu <mhiramat@kernel.org>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama@163.com
Link: http://lkml.kernel.org/r/1461178794-40467-5-git-send-email-wangnan0@huawei.com
Signed-off-by: He Kuang <hekuang@huawei.com>
[ Updated man page, that also got an entry for --timestamp-filename ]
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
---
 tools/perf/Documentation/perf-record.txt | 5 +++++
 tools/perf/builtin-record.c              | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/tools/perf/Documentation/perf-record.txt b/tools/perf/Documentation/perf-record.txt
index a77a431ca4ef..79a8a14f37b1 100644
--- a/tools/perf/Documentation/perf-record.txt
+++ b/tools/perf/Documentation/perf-record.txt
@@ -347,6 +347,9 @@ Configure all used events to run in kernel space.
 --all-user::
 Configure all used events to run in user space.
 
+--timestamp-filename
+Append timestamp to output file name.
+
 --switch-output::
 Generate multiple perf.data files, timestamp prefixed, switching to a new one
 when receiving a SIGUSR2.
@@ -355,6 +358,8 @@ A possible use case is to, given an external event, slice the perf.data file
 that gets then processed, possibly via a perf script, to decide if that
 particular perf.data snapshot should be kept or not.
 
+Implies --timestamp-filename.
+
 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 8ebe953c7af0..80b805b7f5c7 100644
--- a/tools/perf/builtin-record.c
+++ b/tools/perf/builtin-record.c
@@ -1351,6 +1351,9 @@ int cmd_record(int argc, const char **argv, const char *prefix __maybe_unused)
 		return -EINVAL;
 	}
 
+	if (rec->switch_output)
+		rec->timestamp_filename = true;
+
 	if (!rec->itr) {
 		rec->itr = auxtrace_record__init(rec->evlist, &err);
 		if (err)
-- 
2.5.5

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[GIT PULL 00/13] perf/core improvements and fixes Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 09/13] perf record: Force enable --timestamp-filename when --switch-output is provided Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 11/13] perf record: Generate tracking events for process forked by perf Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 10/13] perf record: Disable buildid cache options by default in switch output mode Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 02/13] bpf tools: Fix syscall argument Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 13/13] perf tests: Do not use sizeof on pointer type Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 12/13] perf trace: Move msg_flags beautifier to tools/perf/trace/beauty/ Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:00 +0200
  [PATCH 01/13] bpf tools: Remove expression with no effect Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH 08/13] perf record: Split output into multiple files via '--switch-output' Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH 05/13] perf probe: Use strbuf for making strings Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH 03/13] perf evsel: Handle ENOMEM for perf_event_max_stack + PERF_SAMPLE_CALLCHAIN Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH 04/13] perf evsel: Remove two extraneous ending newlines in open_strerror() Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  [PATCH 06/13] perf tools: Introduce trigger class Arnaldo Carvalho de Melo <acme@kernel.org> - 2016-04-29 17:10 +0200
  Re: [GIT PULL 00/13] perf/core improvements and fixes Ingo Molnar <mingo@kernel.org> - 2016-04-29 21:40 +0200

csiph-web