perf record: Fix use of sample_id_all userspace with !sample_id_all kernels
Commit-ID: a43d3f08c64125edbdfdc3d3aa512d3e37321f37 Gitweb: http://git.kernel.org/tip/a43d3f08c64125edbdfdc3d3aa512d3e37321f37 Author: Arnaldo Carvalho de Melo <[email protected]> AuthorDate: Sat, 25 Dec 2010 12:12:25 -0200 Committer: Arnaldo Carvalho de Melo <[email protected]> CommitDate: Sat, 25 Dec 2010 12:12:25 -0200
perf record: Fix use of sample_id_all userspace with !sample_id_all kernels
Check if parse_single_tracepoint_event has already asked for PERF_SAMPLE_TIME.
This is kludgy but short term fix for problems introduced by eac23d1c that broke 'perf script' by having different sample_types when using multiple tracepoint events when we use a perf binary that tries to use sample_id_all on an older kernel.
We need to move counter creation to perf_session, support different sample_types, etc.
Ongoing work on the perf test infrastructure needs this so that we can create counters to monitor threads generating specific events, etc.
Cc: Frederic Weisbecker <[email protected]>
Cc: Ingo Molnar <[email protected]>
Cc: Mike Galbraith <[email protected]>
Cc: Paul Mackerras <[email protected]>
Cc: Peter Zijlstra <[email protected]>
Cc: Stephane Eranian <[email protected]>
Cc: Tom Zanussi <[email protected]>
Cc: Torok Edwin <[email protected]>
Cc: Ian Munsie <[email protected]>
LKML-Reference: <new-submission>
--- tools/perf/builtin-record.c | 24 +++++++++++++++++++----- 1 files changed, 19 insertions(+), 5 deletions(-)
tools/perf/builtin-record.c +19 -5
@@ -243,6 +243,19 @@ static void create_counter(int counter, int cpu)u64 time_running;u64 id; } read_data; +/* +* Check if parse_single_tracepoint_event has already asked for +* PERF_SAMPLE_TIME. +* +* XXX this is kludgy but short term fix for problems introduced by +* eac23d1c that broke 'perf script' by having different sample_types +* when using multiple tracepoint events when we use a perf binary +* that tries to use sample_id_all on an older kernel. +* +* We need to move counter creation to perf_session, support +* different sample_types, etc. +*/ +bool time_needed = attr->sample_type &PERF_SAMPLE_TIME ; attr->read_format =PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_TOTAL_TIME_RUNNING |
@@ -285,7 +298,8 @@ static void create_counter(int counter, int cpu)if (system_wide) attr->sample_type |=PERF_SAMPLE_CPU ; -if (sample_time || system_wide || !no_inherit || cpu_list) +if (sample_id_all_avail && + (sample_time || system_wide || !no_inherit || cpu_list)) attr->sample_type |=PERF_SAMPLE_TIME ;if (raw_samples) {
@@ -294,9 +308,6 @@ static void create_counter(int counter, int cpu) attr->sample_type |=PERF_SAMPLE_CPU ; } -if (!sample_type) - sample_type = attr->sample_type; - attr->mmap = track; attr->comm = track; attr->inherit = !no_inherit;
@@ -327,7 +338,7 @@ try_again:* Old kernel, no attr->sample_id_type_all field */ sample_id_all_avail = false; -if (!sample_time && !raw_samples) +if (!sample_time && !raw_samples && !time_needed) attr->sample_type &= ~PERF_SAMPLE_TIME ; goto retry_sample_id;
@@ -428,6 +439,9 @@ try_again: } } } + +if (!sample_type) + sample_type = attr->sample_type; }static void open_counters (int cpu)