[tip:perf/core] perf tools: Add __data_loc support

From: tip-bot for Hitoshi Mitake
Date: Sun Jan 31 2010 - 03:31:58 EST

Commit-ID: 86d8d29634de4464d568e7c335c0da6cba64e8ab
Gitweb: http://git.kernel.org/tip/86d8d29634de4464d568e7c335c0da6cba64e8ab
Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
AuthorDate: Sat, 30 Jan 2010 20:43:23 +0900
Committer: Ingo Molnar <mingo@xxxxxxx>
CommitDate: Sun, 31 Jan 2010 08:27:52 +0100

perf tools: Add __data_loc support

This patch is required to test the next patch for perf lock.

At 064739bc4b3d7f424b2f25547e6611bcf0132415 ,
support for the modifier "__data_loc" of format is added.

But, when I wanted to parse format of lock_acquired (or some
event else), raw_field_ptr() did not returned correct pointer.

So I modified raw_field_ptr() like this patch. Then
raw_field_ptr() works well.

Signed-off-by: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx>
Acked-by: Frederic Weisbecker <fweisbec@xxxxxxxxx>
Cc: Peter Zijlstra <a.p.zijlstra@xxxxxxxxx>
Cc: Paul Mackerras <paulus@xxxxxxxxx>
Cc: Tom Zanussi <tzanussi@xxxxxxxxx>
Cc: Steven Rostedt <srostedt@xxxxxxxxxx>
LKML-Reference: <1264851813-8413-2-git-send-email-mitake@xxxxxxxxxxxxxxxxxxxxx>
[ v3: fixed minor stylistic detail ]
Signed-off-by: Ingo Molnar <mingo@xxxxxxx>
tools/perf/util/trace-event-parse.c | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index c5c32be..c4b3cb8 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1925,6 +1925,15 @@ void *raw_field_ptr(struct event *event, const char *name, void *data)
if (!field)
return NULL;

+ if (field->flags & FIELD_IS_STRING) {
+ int offset;
+ offset = *(int *)(data + field->offset);
+ offset &= 0xffff;
+ return data + offset;
+ }
return data + field->offset;

To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/