Commit-ID: 736cbecc4247e2f8277c6cd404942a8b45331036 Gitweb: http://git.kernel.org/tip/736cbecc4247e2f8277c6cd404942a8b45331036 Author: Hitoshi Mitake <mitake@xxxxxxxxxxxxxxxxxxxxx> AuthorDate: Mon, 7 Dec 2009 12:34:43 +0900 Committer: Ingo Molnar <mingo@xxxxxxx> CommitDate: Mon, 7 Dec 2009 08:23:47 +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. 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> Signed-off-by: Ingo Molnar <mingo@xxxxxxx> --- tools/perf/util/trace-event-parse.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 6ffe9d6..be2af73 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -1925,6 +1925,13 @@ 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-tip-commits" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html