[PATCH] perf tools: Allow expressions in __print_symbolic() fields

[PATCH] perf tools: Allow expressions in __print_symbolic() fields

[Stefan Hajnoczi]

The __print_symbolic() function takes a sequence of key-value pairs for
pretty-printing a constant.  The new kvm:kvm_exit print fmt uses the
expression:

  __print_symbolic(..., { 0x040 + 1, "DB excp" }, ...)

Currently only atoms are supported and this print fmt fails to parse.
This patch adds support for expressions instead of just atoms so that
0x040 + 1 is parsed successfully.  Also add arg_num_eval() support for
the '+' operator.

Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
---
The kvm:kvm_exit event was not recording enough information to format it.  I
recently fixed this by introducing a __print_symbolic(), this commit has not
yet hit linux.git but I think it will soon.  In order to correctly format the
new kvm:kvm_exit, this patch to extend event parsing is required.

 tools/perf/util/trace-event-parse.c |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
index 0a7ed5b..d0a4548 100644
--- a/tools/perf/util/trace-event-parse.c
+++ b/tools/perf/util/trace-event-parse.c
@@ -1425,6 +1425,11 @@ static long long arg_num_eval(struct print_arg *arg)
 				die("unknown op '%s'", arg->op.op);
 			}
 			break;
+		case '+':
+			left = arg_num_eval(arg->op.left);
+			right = arg_num_eval(arg->op.right);
+			val = left + right;
+			break;
 		default:
 			die("unknown op '%s'", arg->op.op);
 		}
@@ -1485,6 +1490,13 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok)
 
 		free_token(token);
 		type = process_arg(event, arg, &token);
+
+		if (type == EVENT_OP)
+			type = process_op(event, arg, &token);
+
+		if (type == EVENT_ERROR)
+			goto out_free;
+
 		if (test_type_token(type, token, EVENT_DELIM, ","))
 			goto out_free;
 
-- 
1.7.5.4

Re: [PATCH] perf tools: Allow expressions in __print_symbolic() fields

[Steven Rostedt]

Arnaldo,

Can you pull this patch into perf? You can add my:

Acked-by: Steven Rostedt <rostedt@goodmis.org>

Thanks!

-- Steve


On Sun, 2011-09-04 at 16:08 +0100, Stefan Hajnoczi wrote:
> The __print_symbolic() function takes a sequence of key-value pairs for
> pretty-printing a constant.  The new kvm:kvm_exit print fmt uses the
> expression:
> 
>   __print_symbolic(..., { 0x040 + 1, "DB excp" }, ...)
> 
> Currently only atoms are supported and this print fmt fails to parse.
> This patch adds support for expressions instead of just atoms so that
> 0x040 + 1 is parsed successfully.  Also add arg_num_eval() support for
> the '+' operator.
> 
> Signed-off-by: Stefan Hajnoczi <stefanha@linux.vnet.ibm.com>
> ---
> The kvm:kvm_exit event was not recording enough information to format it.  I
> recently fixed this by introducing a __print_symbolic(), this commit has not
> yet hit linux.git but I think it will soon.  In order to correctly format the
> new kvm:kvm_exit, this patch to extend event parsing is required.
> 
>  tools/perf/util/trace-event-parse.c |   12 ++++++++++++
>  1 files changed, 12 insertions(+), 0 deletions(-)
> 
> diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c
> index 0a7ed5b..d0a4548 100644
> --- a/tools/perf/util/trace-event-parse.c
> +++ b/tools/perf/util/trace-event-parse.c
> @@ -1425,6 +1425,11 @@ static long long arg_num_eval(struct print_arg *arg)
>  				die("unknown op '%s'", arg->op.op);
>  			}
>  			break;
> +		case '+':
> +			left = arg_num_eval(arg->op.left);
> +			right = arg_num_eval(arg->op.right);
> +			val = left + right;
> +			break;
>  		default:
>  			die("unknown op '%s'", arg->op.op);
>  		}
> @@ -1485,6 +1490,13 @@ process_fields(struct event *event, struct print_flag_sym **list, char **tok)
>  
>  		free_token(token);
>  		type = process_arg(event, arg, &token);
> +
> +		if (type == EVENT_OP)
> +			type = process_op(event, arg, &token);
> +
> +		if (type == EVENT_ERROR)
> +			goto out_free;
> +
>  		if (test_type_token(type, token, EVENT_DELIM, ","))
>  			goto out_free;
>