handle new "signed" field in format layout

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

1 files changed, 55 insertions, 9 deletions

diff --git a/parse-events.c b/parse-events.c
index 9b4960f..7541af2 100644
--- a/parse-events.c
+++ b/parse-events.c
@@ -917,8 +917,30 @@ int event_read_fields(struct event *event, struct format_field **fields)
                 if (read_expected(EVENT_OP, ";") < 0)
                         goto fail_expect;
 
-                if (read_expect_type(EVENT_NEWLINE, &token) < 0)
-                        goto fail;
+                type = read_token(&token);
+                if (type != EVENT_NEWLINE) {
+                        /* newer versions of the kernel have a "signed" type */
+                        if (test_type_token(type, token, EVENT_ITEM, "signed"))
+                                goto fail;
+
+                        free_token(token);
+
+                        if (read_expected(EVENT_OP, ":") < 0)
+                                goto fail_expect;
+
+                        if (read_expect_type(EVENT_ITEM, &token))
+                                goto fail;
+
+                        /* add signed type */
+
+                        free_token(token);
+                        if (read_expected(EVENT_OP, ";") < 0)
+                                goto fail_expect;
+
+                        if (read_expect_type(EVENT_NEWLINE, &token))
+                                goto fail;
+                }
+
                 free_token(token);
 
                 *fields = field;
@@ -2952,10 +2974,11 @@ void print_args(struct print_arg *args)
         }
 }
 
-static void parse_header_field(char *type,
+static void parse_header_field(char *field,
                                int *offset, int *size)
 {
         char *token;
+        int type;
 
         if (read_expected(EVENT_ITEM, "field") < 0)
                 return;
@@ -2964,10 +2987,10 @@ static void parse_header_field(char *type,
 
         /* type */
         if (read_expect_type(EVENT_ITEM, &token) < 0)
-                return;
+                goto fail;
         free_token(token);
 
-        if (read_expected(EVENT_ITEM, type) < 0)
+        if (read_expected(EVENT_ITEM, field) < 0)
                 return;
         if (read_expected(EVENT_OP, ";") < 0)
                 return;
@@ -2976,7 +2999,7 @@ static void parse_header_field(char *type,
         if (read_expected(EVENT_OP, ":") < 0)
                 return;
         if (read_expect_type(EVENT_ITEM, &token) < 0)
-                return;
+                goto fail;
         *offset = atoi(token);
         free_token(token);
         if (read_expected(EVENT_OP, ";") < 0)
@@ -2986,13 +3009,36 @@ static void parse_header_field(char *type,
         if (read_expected(EVENT_OP, ":") < 0)
                 return;
         if (read_expect_type(EVENT_ITEM, &token) < 0)
-                return;
+                goto fail;
         *size = atoi(token);
         free_token(token);
         if (read_expected(EVENT_OP, ";") < 0)
                 return;
-        if (read_expect_type(EVENT_NEWLINE, &token) < 0)
-                return;
+        type = read_token(&token);
+        if (type != EVENT_NEWLINE) {
+                /* newer versions of the kernel have a "signed" type */
+                if (type != EVENT_ITEM)
+                        goto fail;
+
+                if (strcmp(token, "signed") != 0)
+                        goto fail;
+
+                free_token(token);
+
+                if (read_expected(EVENT_OP, ":") < 0)
+                        return;
+
+                if (read_expect_type(EVENT_ITEM, &token))
+                        goto fail;
+
+                free_token(token);
+                if (read_expected(EVENT_OP, ";") < 0)
+                        return;
+
+                if (read_expect_type(EVENT_NEWLINE, &token))
+                        goto fail;
+        }
+ fail:
         free_token(token);
 }