From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754754Ab1CUWeu (ORCPT ); Mon, 21 Mar 2011 18:34:50 -0400 Received: from smtp-out.google.com ([74.125.121.67]:6102 "EHLO smtp-out.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754732Ab1CUWer (ORCPT ); Mon, 21 Mar 2011 18:34:47 -0400 DomainKey-Signature: a=rsa-sha1; s=beta; d=google.com; c=nofws; q=dns; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=NyR0IpdiJk6iFv+QSMFH08IP1yCIFEBEx9BC4KcoEZKoQ8VA/X2SfH2XyWtxeYXF5 CfMHT8XLJmOFcjStoVWGQ== From: David Sharp To: linux-kernel@vger.kernel.org Cc: mrubin@google.com, David Sharp , Arnaldo Carvalho de Melo , Frederic Weisbecker , Steven Rostedt , Ingo Molnar , Stephane Eranian Subject: [PATCH perf 1/2] perf: trace-event-parse: support additional operators: '!', '~', and '!=' Date: Mon, 21 Mar 2011 15:34:05 -0700 Message-Id: <1300746846-28245-2-git-send-email-dhsharp@google.com> X-Mailer: git-send-email 1.7.3.1 In-Reply-To: <1300746846-28245-1-git-send-email-dhsharp@google.com> References: <1300746846-28245-1-git-send-email-dhsharp@google.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Add support for the unary operators '!' and '~', and support '!=' so that it is differentiated from '!'. Signed-off-by: David Sharp Cc: Arnaldo Carvalho de Melo Cc: Frederic Weisbecker Cc: Steven Rostedt Cc: Ingo Molnar Cc: Stephane Eranian --- tools/perf/util/trace-event-parse.c | 19 +++++++++++++++++++ 1 files changed, 19 insertions(+), 0 deletions(-) diff --git a/tools/perf/util/trace-event-parse.c b/tools/perf/util/trace-event-parse.c index 73a0222..67fe01a 100644 --- a/tools/perf/util/trace-event-parse.c +++ b/tools/perf/util/trace-event-parse.c @@ -1107,6 +1107,9 @@ static int get_op_prio(char *op) { if (!op[1]) { switch (op[0]) { + case '~': + case '!': + return 4; case '*': case '/': case '%': @@ -1184,6 +1187,7 @@ process_op(struct event *event, struct print_arg *arg, char **tok) return EVENT_ERROR; } switch (token[0]) { + case '~': case '!': case '+': case '-': @@ -2109,6 +2113,21 @@ static unsigned long long eval_num_arg(void *data, int size, left = eval_num_arg(data, size, event, arg->op.left); right = eval_num_arg(data, size, event, arg->op.right); switch (arg->op.op[0]) { + case '!': + switch (arg->op.op[1]) { + case 0: + val = !right; + break; + case '=': + val = left != right; + break; + default: + die("unknown op '%s'", arg->op.op); + } + break; + case '~': + val = ~right; + break; case '|': if (arg->op.op[1]) val = left || right; -- 1.7.3.1