diff options
author | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-01 03:08:46 +0200 |
---|---|---|
committer | Frederic Weisbecker <fweisbec@gmail.com> | 2010-05-01 04:31:48 +0200 |
commit | d00a47cce569a3e660a8c9de5d57af28d6a9f0f7 (patch) | |
tree | 0993bc6584d8726a7a921f9a13ce11f7c560cdb0 /include/sound | |
parent | e5a5f1f015cf435eb3d2f5712ba51ffdbb92cbef (diff) | |
download | blackbird-op-linux-d00a47cce569a3e660a8c9de5d57af28d6a9f0f7.tar.gz blackbird-op-linux-d00a47cce569a3e660a8c9de5d57af28d6a9f0f7.zip |
perf: Fix warning while reading ring buffer headers
commit e9e94e3bd862d31777335722e747e97d9821bc1d
"perf trace: Ignore "overwrite" field if present in
/events/header_page" makes perf trace launching spurious warnings
about unexpected tokens read:
Warning: Error: expected type 6 but read 4
This change tries to handle the overcommit field in the header_page
file whenever this field is present or not.
The problem is that if this field is not present, we try to find it
and give up in the middle of the line when we realize we are actually
dealing with another field, which is the "data" one. And this failure
abandons the file pointer in the middle of the "data" description
line:
field: u64 timestamp; offset:0; size:8; signed:0;
field: local_t commit; offset:8; size:8; signed:1;
field: char data; offset:16; size:4080; signed:1;
^^^
Here
What happens next is that we want to read this line to parse the data
field, but we fail because the pointer is not in the beginning of the
line.
We could probably fix that by rewinding the pointer. But in fact we
don't care much about these headers that only concern the ftrace
ring-buffer. We don't use them from perf.
Just skip this part of perf.data, but don't remove it from recording
to stay compatible with olders perf.data
Signed-off-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Stephane Eranian <eranian@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Diffstat (limited to 'include/sound')
0 files changed, 0 insertions, 0 deletions