Add structure align() attribute, fix empty string support in definition paths

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index 6012447bc2a678194aa4ba5dc8a278ea3e58073e..a6b7e3b98da185eaabbb251eab029fdd79c24d45 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -68,7 +68,8 @@ void _struct_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_struct *
-       struct_declaration_new(struct declaration_scope *parent_scope)
+       struct_declaration_new(struct declaration_scope *parent_scope,
+                              uint64_t min_align)
 {
        struct declaration_struct *struct_declaration;
        struct declaration *declaration;
@@ -82,7 +83,7 @@ struct declaration_struct *
                                                DEFAULT_NR_STRUCT_FIELDS);
        struct_declaration->scope = new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_STRUCT;
-       declaration->alignment = 1;
+       declaration->alignment = max(1, min_align);
        declaration->declaration_free = _struct_declaration_free;
        declaration->definition_new = _struct_definition_new;
        declaration->definition_free = _struct_definition_free;
@@ -216,3 +217,8 @@ struct_definition_get_field_from_index(struct definition_struct *_struct,
                return NULL;
        return g_ptr_array_index(_struct->fields, index);
 }
+
+uint64_t struct_declaration_len(struct declaration_struct *struct_declaration)
+{
+       return struct_declaration->fields->len;
+}