Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 064739bc authored by Tom Zanussi's avatar Tom Zanussi Committed by Ingo Molnar
Browse files

perf trace: Add string/dynamic cases to format_flags 



Needed for distinguishing string fields in event stream processing.

Signed-off-by: default avatarTom Zanussi <tzanussi@gmail.com>
Acked-by: default avatarFrederic 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: default avatarIngo Molnar <mingo@elte.hu>
parent 27746018

tools/perf/util/trace-event-parse.c

+24 −0
Original line number Diff line number Diff line
@@ -721,6 +721,24 @@ static int event_read_id(void) 
	return -1;

}



static int field_is_string(struct format_field *field)

{

	if ((field->flags & FIELD_IS_ARRAY) &&

	    (!strstr(field->type, "char") || !strstr(field->type, "u8") ||

	     !strstr(field->type, "s8")))

		return 1;



	return 0;

}



static int field_is_dynamic(struct format_field *field)

{

	if (!strcmp(field->type, "__data_loc"))

		return 1;



	return 0;

}



static int event_read_fields(struct event *event, struct format_field **fields)

{

	struct format_field *field = NULL;
@@ -865,6 +883,12 @@ static int event_read_fields(struct event *event, struct format_field **fields) 
			free(brackets);

		}



		if (field_is_string(field)) {

			field->flags |= FIELD_IS_STRING;

			if (field_is_dynamic(field))

				field->flags |= FIELD_IS_DYNAMIC;

		}



		if (test_type_token(type, token,  EVENT_OP, (char *)";"))

			goto fail;

		free_token(token);

tools/perf/util/trace-event.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ enum format_flags { 
	FIELD_IS_ARRAY		= 1,

	FIELD_IS_POINTER	= 2,

	FIELD_IS_SIGNED		= 4,

	FIELD_IS_STRING		= 8,

	FIELD_IS_DYNAMIC	= 16,

};



struct format_field {