From c49e90d62f195f32b846a45fdc41685209dadf0a Mon Sep 17 00:00:00 2001 From: Frederic Weisbecker Date: Mon, 31 Aug 2009 06:45:21 +0200 Subject: [PATCH] --- yaml --- r: 158294 b: refs/heads/master c: 561f732c1233f6bf7c3c5c5fb9b4d90bb6c107aa h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/tools/perf/util/trace-event-parse.c | 16 ++++++++++++++-- trunk/tools/perf/util/trace-event.h | 1 + 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index 22906f8293f3..a184149ba01b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 9b8055a52c8986167e0a7357460d528a00db67e6 +refs/heads/master: 561f732c1233f6bf7c3c5c5fb9b4d90bb6c107aa diff --git a/trunk/tools/perf/util/trace-event-parse.c b/trunk/tools/perf/util/trace-event-parse.c index 96c5e97ffe7b..665dac20cd1e 100644 --- a/trunk/tools/perf/util/trace-event-parse.c +++ b/trunk/tools/perf/util/trace-event-parse.c @@ -1548,6 +1548,7 @@ process_str(struct event *event __unused, struct print_arg *arg, char **tok) arg->type = PRINT_STRING; arg->string.string = token; + arg->string.offset = -1; if (read_expected(EVENT_DELIM, (char *)")") < 0) return EVENT_ERROR; @@ -2031,9 +2032,20 @@ static void print_str_arg(void *data, int size, case PRINT_TYPE: break; - case PRINT_STRING: - printf("%s", arg->string.string); + case PRINT_STRING: { + int str_offset; + + if (arg->string.offset == -1) { + struct format_field *f; + + f = find_any_field(event, arg->string.string); + arg->string.offset = f->offset; + } + str_offset = *(int *)(data + arg->string.offset); + str_offset &= 0xffff; + printf("%s", ((char *)data) + str_offset); break; + } case PRINT_OP: /* * The only op for string should be ? : diff --git a/trunk/tools/perf/util/trace-event.h b/trunk/tools/perf/util/trace-event.h index 051fcf363825..420294a5773e 100644 --- a/trunk/tools/perf/util/trace-event.h +++ b/trunk/tools/perf/util/trace-event.h @@ -50,6 +50,7 @@ struct print_arg_atom { struct print_arg_string { char *string; + int offset; }; struct print_arg_field {