Commit 9df37ddd authored by Frederic Weisbecker's avatar Frederic Weisbecker Committed by Ingo Molnar

perf tools: Record events info also when :record suffix is used.

You can enable a counter's PERF_SAMPLE_RAW attribute in two
fashions:

- using the -R option (every counters get PERF_SAMPLE_RAW)
- using the :record suffix in a trace event counter name

Currently we record the events info in a trace.info file from
perf record when the former method is used but we omit it with
the latter.

Check both situations.
Signed-off-by: default avatarFrederic Weisbecker <fweisbec@gmail.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Steven Rostedt <rostedt@goodmis.org>
LKML-Reference: <1250543271-8383-3-git-send-email-fweisbec@gmail.com>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent 4bf2364a
...@@ -520,9 +520,6 @@ static int __cmd_record(int argc, const char **argv) ...@@ -520,9 +520,6 @@ static int __cmd_record(int argc, const char **argv)
signal(SIGCHLD, sig_handler); signal(SIGCHLD, sig_handler);
signal(SIGINT, sig_handler); signal(SIGINT, sig_handler);
if (raw_samples)
read_tracing_data();
if (!stat(output_name, &st) && st.st_size) { if (!stat(output_name, &st) && st.st_size) {
if (!force && !append_file) { if (!force && !append_file) {
fprintf(stderr, "Error, output file %s exists, use -A to append or -f to overwrite.\n", fprintf(stderr, "Error, output file %s exists, use -A to append or -f to overwrite.\n",
...@@ -550,6 +547,17 @@ static int __cmd_record(int argc, const char **argv) ...@@ -550,6 +547,17 @@ static int __cmd_record(int argc, const char **argv)
else else
header = perf_header__new(); header = perf_header__new();
if (raw_samples) {
read_tracing_data();
} else {
for (i = 0; i < nr_counters; i++) {
if (attrs[i].sample_type & PERF_SAMPLE_RAW) {
read_tracing_data();
break;
}
}
}
atexit(atexit_header); atexit(atexit_header);
if (!system_wide) { if (!system_wide) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment