From c7a37c775ed046ff87f1ee9819be2ee195590a4a Mon Sep 17 00:00:00 2001 From: Hitoshi Mitake Date: Sat, 30 Jan 2010 20:43:23 +0900 Subject: [PATCH] --- yaml --- r: 182434 b: refs/heads/master c: 86d8d29634de4464d568e7c335c0da6cba64e8ab h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/trace-event-parse.c | 9 +++++++++ 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 7e0bc0155b7a..e8f044a9d953 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: a8e6f734ce9a79d44ebb296f2a341f435227b34e +refs/heads/master: 86d8d29634de4464d568e7c335c0da6cba64e8ab diff --git a/trunk/tools/perf/util/trace-event-parse.c b/trunk/tools/perf/util/trace-event-parse.c index c5c32be040bf..c4b3cb8a02b1 100644 --- a/trunk/tools/perf/util/trace-event-parse.c +++ b/trunk/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; }