From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1759258Ab2DYM3a (ORCPT ); Wed, 25 Apr 2012 08:29:30 -0400 Received: from mail-ee0-f46.google.com ([74.125.83.46]:44117 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750766Ab2DYM2c (ORCPT ); Wed, 25 Apr 2012 08:28:32 -0400 From: Frederic Weisbecker To: Ingo Molnar Cc: LKML , Vaibhav Nagarnaik , Michael Rubin , David Sharp , Steven Rostedt , Thomas Gleixner , Peter Zijlstra , Arnaldo Carvalho de Melo , Borislav Petkov , Jiri Olsa , Arun Sharma , Namhyung Kim , David Ahern , Frederic Weisbecker Subject: [PATCH 12/15] parse-events: Support '+' opcode in print format Date: Wed, 25 Apr 2012 14:26:56 +0200 Message-Id: <1335356819-16710-13-git-send-email-fweisbec@gmail.com> X-Mailer: git-send-email 1.7.5.4 In-Reply-To: <1335356819-16710-1-git-send-email-fweisbec@gmail.com> References: <1335356819-16710-1-git-send-email-fweisbec@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Vaibhav Nagarnaik The '+' opcode is not supported in the arguments for the print format. This patch adds support for it. Cc: Michael Rubin Cc: David Sharp Signed-off-by: Vaibhav Nagarnaik Link: http://lkml.kernel.org/r/1310785241-3799-4-git-send-email-vnagarnaik@google.com Signed-off-by: Steven Rostedt Cc: Ingo Molnar Cc: Thomas Gleixner Cc: Peter Zijlstra Cc: Arnaldo Carvalho de Melo Cc: Steven Rostedt Cc: Borislav Petkov Cc: Jiri Olsa Cc: Arun Sharma Cc: Namhyung Kim Cc: David Ahern Signed-off-by: Frederic Weisbecker --- tools/lib/traceevent/event-parse.c | 12 ++++++++++++ 1 files changed, 12 insertions(+), 0 deletions(-) diff --git a/tools/lib/traceevent/event-parse.c b/tools/lib/traceevent/event-parse.c index 4d5092f..476626a 100644 --- a/tools/lib/traceevent/event-parse.c +++ b/tools/lib/traceevent/event-parse.c @@ -2047,6 +2047,18 @@ static int arg_num_eval(struct print_arg *arg, long long *val) break; *val = left - right; break; + case '+': + if (arg->op.left->type == PRINT_NULL) + left = 0; + else + ret = arg_num_eval(arg->op.left, &left); + if (!ret) + break; + ret = arg_num_eval(arg->op.right, &right); + if (!ret) + break; + *val = left + right; + break; default: do_warning("unknown op '%s'", arg->op.op); ret = 0; -- 1.7.5.4