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

Commit eff2c92f authored by Steven Rostedt's avatar Steven Rostedt Committed by Arnaldo Carvalho de Melo
Browse files

tools lib traceevent: Fix use of multiple options in processing field 



Jiri Olsa reported that the scsi_dispatch_cmd_done event failed to parse
with:

  Error: expected type 5 but read 4
  Error: expected type 5 but read 4

The problem is with this part of the print_fmt:

  __print_symbolic(((REC->result) >> 24) & 0xff, ...

The __print_symbolic() helper function's first parameter is the field to
use to determine what symbol to print based on the value of the result.
The parser can handle one operation, but it can not handle multiple
operations ('>>' and '&').

Add code to process all operations for the field argument for
__print_symbolic() as well as __print_flags().

Reported-by: default avatarJiri Olsa <jolsa@redhat.com>
Signed-off-by: default avatarSteven Rostedt <rostedt@goodmis.org>
Cc: Frederic Weisbecker <fweisbec@gmail.com>
Cc: Ingo Molnar <mingo@kernel.org>
Cc: Jiri Olsa <jolsa@redhat.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Link: http://lkml.kernel.org/r/20131118142314.27ca334b@gandalf.local.home


Signed-off-by: default avatarArnaldo Carvalho de Melo <acme@redhat.com>
parent 50a2740b

tools/lib/traceevent/event-parse.c

+21 −2
Original line number Diff line number Diff line
@@ -1606,6 +1606,24 @@ process_arg(struct event_format *event, struct print_arg *arg, char **tok) 
static enum event_type

process_op(struct event_format *event, struct print_arg *arg, char **tok);



/*

 * For __print_symbolic() and __print_flags, we need to completely

 * evaluate the first argument, which defines what to print next.

 */

static enum event_type

process_field_arg(struct event_format *event, struct print_arg *arg, char **tok)

{

	enum event_type type;



	type = process_arg(event, arg, tok);



	while (type == EVENT_OP) {

		type = process_op(event, arg, tok);

	}



	return type;

}



static enum event_type

process_cond(struct event_format *event, struct print_arg *top, char **tok)

{
@@ -2371,7 +2389,7 @@ process_flags(struct event_format *event, struct print_arg *arg, char **tok) 
		goto out_free;

	}



	type = process_arg(event, field, &token);

	type = process_field_arg(event, field, &token);



	/* Handle operations in the first argument */

	while (type == EVENT_OP)
@@ -2424,7 +2442,8 @@ process_symbols(struct event_format *event, struct print_arg *arg, char **tok) 
		goto out_free;

	}



	type = process_arg(event, field, &token);

	type = process_field_arg(event, field, &token);



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

		goto out_free_field;