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

Commit 924a79af authored by Steven Rostedt's avatar Steven Rostedt Committed by Ingo Molnar
Browse files

perf tools: Handle print concatenations in event format file 



kmem_alloc ftrace event format had a string that was broken up
by two tokens. "string 1" "string 2". This patch lets the parser
be able to handle the concatenation.

Signed-off-by: default avatarSteven Rostedt <srostedt@redhat.com>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Arnaldo Carvalho de Melo <acme@redhat.com>
LKML-Reference: <20091014194357.253818714@goodmis.org>
Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parent b226f744

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

+16 −0
Original line number Diff line number Diff line
@@ -1734,6 +1734,7 @@ static int event_read_print(struct event *event) 
	if (read_expect_type(EVENT_DQUOTE, &token) < 0)

		goto fail;



 concat:

	event->print_fmt.format = token;

	event->print_fmt.args = NULL;
@@ -1743,6 +1744,21 @@ static int event_read_print(struct event *event) 
	if (type == EVENT_NONE)

		return 0;



	/* Handle concatination of print lines */

	if (type == EVENT_DQUOTE) {

		char *cat;



		cat = malloc_or_die(strlen(event->print_fmt.format) +

				    strlen(token) + 1);

		strcpy(cat, event->print_fmt.format);

		strcat(cat, token);

		free_token(token);

		free_token(event->print_fmt.format);

		event->print_fmt.format = NULL;

		token = cat;

		goto concat;

	}

			     

	if (test_type_token(type, token, EVENT_DELIM, (char *)","))

		goto fail;