parse-events: Handle operations within a condition

The conditon ? : does not handle other operations within it (like << which
the ext4 tracepoints added). This patch makes the conditions handle operations
within them.

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

1 files changed, 20 insertions, 1 deletions

diff --git a/parse-events.c b/parse-events.c
index e942916..3c2e9a0 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -1419,6 +1419,9 @@ 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);
+
+static enum event_type
 process_cond(struct event_format *event, struct print_arg *top, char **tok)
 {
         struct print_arg *arg, *left, *right;
@@ -1435,6 +1438,14 @@ process_cond(struct event_format *event, struct print_arg *top, char **tok)
 
         *tok = NULL;
         type = process_arg(event, left, &token);
+
+ again:
+        /* Handle other operations in the arguments */
+        if (type == EVENT_OP && strcmp(token, ":") != 0) {
+                type = process_op(event, left, &token);
+                goto again;
+        }
+
         if (test_type_token(type, token, EVENT_OP, ":"))
                 goto out_free;
 
@@ -1670,7 +1681,7 @@ process_op(struct event_format *event, struct print_arg *arg, char **tok)
                 goto out_free;
         }
 
-        if (type == EVENT_OP) {
+        if (type == EVENT_OP && strcmp(*tok, ":") != 0) {
                 int prio;
 
                 /* higher prios need to be closer to the root */
@@ -2860,6 +2871,14 @@ eval_num_arg(void *data, int size, struct event_format *event, struct print_arg
                         if (typearg)
                                 val = eval_type(val, typearg, 1);
                         break;
+                } else if (strcmp(arg->op.op, "?") == 0) {
+                        left = eval_num_arg(data, size, event, arg->op.left);
+                        arg = arg->op.right;
+                        if (left)
+                                val = eval_num_arg(data, size, event, arg->op.left);
+                        else
+                                val = eval_num_arg(data, size, event, arg->op.right);
+                        break;
                 }
  default_op:
                 left = eval_num_arg(data, size, event, arg->op.left);