diff options
| author | Tom Zanussi <tzanussi@gmail.com> | 2009-10-06 02:09:52 -0400 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2009-10-06 09:04:46 -0400 |
| commit | 064739bc4b3d7f424b2f25547e6611bcf0132415 (patch) | |
| tree | 078924939969382e35548b9987ddf58d6572334b /tools/perf/util/trace-event-parse.c | |
| parent | 2774601811bedd04ee7e38624343ea80b4a62d7e (diff) | |
perf trace: Add string/dynamic cases to format_flags
Needed for distinguishing string fields in event stream processing.
Signed-off-by: Tom Zanussi <tzanussi@gmail.com>
Acked-by: Frederic Weisbecker <fweisbec@gmail.com>
Cc: rostedt@goodmis.org
Cc: lizf@cn.fujitsu.com
Cc: hch@infradead.org
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Mike Galbraith <efault@gmx.de>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <1254809398-8078-4-git-send-email-tzanussi@gmail.com>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Diffstat (limited to 'tools/perf/util/trace-event-parse.c')
| -rw-r--r-- | tools/perf/util/trace-event-parse.c | 24 |
1 files changed, 24 insertions, 0 deletions
diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index de3fc8bf8bfe..6f851f98b5b4 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c | |||
| @@ -721,6 +721,24 @@ static int event_read_id(void) | |||
| 721 | return -1; | 721 | return -1; |
| 722 | } | 722 | } |
| 723 | 723 | ||
| 724 | static int field_is_string(struct format_field *field) | ||
| 725 | { | ||
| 726 | if ((field->flags & FIELD_IS_ARRAY) && | ||
| 727 | (!strstr(field->type, "char") || !strstr(field->type, "u8") || | ||
| 728 | !strstr(field->type, "s8"))) | ||
| 729 | return 1; | ||
| 730 | |||
| 731 | return 0; | ||
| 732 | } | ||
| 733 | |||
| 734 | static int field_is_dynamic(struct format_field *field) | ||
| 735 | { | ||
| 736 | if (!strcmp(field->type, "__data_loc")) | ||
| 737 | return 1; | ||
| 738 | |||
| 739 | return 0; | ||
| 740 | } | ||
| 741 | |||
| 724 | static int event_read_fields(struct event *event, struct format_field **fields) | 742 | static int event_read_fields(struct event *event, struct format_field **fields) |
| 725 | { | 743 | { |
| 726 | struct format_field *field = NULL; | 744 | struct format_field *field = NULL; |
| @@ -865,6 +883,12 @@ static int event_read_fields(struct event *event, struct format_field **fields) | |||
| 865 | free(brackets); | 883 | free(brackets); |
| 866 | } | 884 | } |
| 867 | 885 | ||
| 886 | if (field_is_string(field)) { | ||
| 887 | field->flags |= FIELD_IS_STRING; | ||
| 888 | if (field_is_dynamic(field)) | ||
| 889 | field->flags |= FIELD_IS_DYNAMIC; | ||
| 890 | } | ||
| 891 | |||
| 868 | if (test_type_token(type, token, EVENT_OP, (char *)";")) | 892 | if (test_type_token(type, token, EVENT_OP, (char *)";")) |
| 869 | goto fail; | 893 | goto fail; |
| 870 | free_token(token); | 894 | free_token(token); |
