Packet metadata read should substract header size

[babeltrace.git] / types / integer.c

diff --git a/types/integer.c b/types/integer.c
index c43f55e64c68bd623c0b1c214c1d269f85e20ec4..5f9989b2111493ad0bdfe98c27805faf33d598e9 100644 (file)
--- a/types/integer.c
+++ b/types/integer.c
@@ -24,7 +24,8 @@
 static
 struct definition *_integer_definition_new(struct declaration *declaration,
                               struct definition_scope *parent_scope,
-                              GQuark field_name, int index);
+                              GQuark field_name, int index,
+                              const char *root_name);
 static
 void _integer_definition_free(struct definition *definition);
 
@@ -38,7 +39,8 @@ void _integer_declaration_free(struct declaration *declaration)
 
 struct declaration_integer *
        integer_declaration_new(size_t len, int byte_order,
-                        int signedness, size_t alignment)
+                        int signedness, size_t alignment, int base,
+                        enum ctf_string_encoding encoding)
 {
        struct declaration_integer *integer_declaration;
 
@@ -52,6 +54,8 @@ struct declaration_integer *
        integer_declaration->len = len;
        integer_declaration->byte_order = byte_order;
        integer_declaration->signedness = signedness;
+       integer_declaration->base = base;
+       integer_declaration->encoding = encoding;
        return integer_declaration;
 }
 
@@ -59,20 +63,32 @@ static
 struct definition *
        _integer_definition_new(struct declaration *declaration,
                                struct definition_scope *parent_scope,
-                               GQuark field_name, int index)
+                               GQuark field_name, int index,
+                               const char *root_name)
 {
        struct declaration_integer *integer_declaration =
                container_of(declaration, struct declaration_integer, p);
        struct definition_integer *integer;
+       int ret;
 
        integer = g_new(struct definition_integer, 1);
        declaration_ref(&integer_declaration->p);
        integer->p.declaration = declaration;
        integer->declaration = integer_declaration;
        integer->p.ref = 1;
-       integer->p.index = index;
+       /*
+        * Use INT_MAX order to ensure that all fields of the parent
+        * scope are seen as being prior to this scope.
+        */
+       integer->p.index = root_name ? INT_MAX : index;
        integer->p.name = field_name;
+       integer->p.path = new_definition_path(parent_scope, field_name,
+                                       root_name);
+       integer->p.scope = NULL;
        integer->value._unsigned = 0;
+       ret = register_field_definition(field_name, &integer->p,
+                                       parent_scope);
+       assert(!ret);
        return &integer->p;
 }