From mboxrd@z Thu Jan 1 00:00:00 1970 From: Steven Rostedt Subject: Re: [PATCH] perf tools: Allow expressions in __print_symbolic() fields Date: Wed, 08 Feb 2012 20:44:24 -0500 Message-ID: <1328751864.2200.125.camel@gandalf.stny.rr.com> References: <1315148939-14313-1-git-send-email-stefanha@linux.vnet.ibm.com> Mime-Version: 1.0 Content-Type: text/plain; charset="ISO-8859-15" Content-Transfer-Encoding: 7bit Return-path: Received: from hrndva-omtalb.mail.rr.com ([71.74.56.124]:38695 "EHLO hrndva-omtalb.mail.rr.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751002Ab2BIBoZ (ORCPT ); Wed, 8 Feb 2012 20:44:25 -0500 In-Reply-To: <1315148939-14313-1-git-send-email-stefanha@linux.vnet.ibm.com> Sender: linux-perf-users-owner@vger.kernel.org List-ID: To: Stefan Hajnoczi Cc: linux-kernel@vger.kernel.org, Arnaldo Carvalho de Melo , Ingo Molnar , linux-perf-users@vger.kernel.org Arnaldo, Can you pull this patch into perf? You can add my: Acked-by: Steven Rostedt 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 > --- > 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; >