configure: check for elfutils (libelf and libdw) >= 0.154

[babeltrace.git] / types / struct.c

diff --git a/types/struct.c b/types/struct.c
index f065dbc7fe6f335b25ce2d67f18ba71a25e90bc5..7eaa42426054b9a617c551da6fcc38006bcee7e7 100644 (file)
--- a/types/struct.c
+++ b/types/struct.c
@@ -36,14 +36,14 @@
 #endif
 
 static
-struct definition *_struct_definition_new(struct declaration *declaration,
+struct bt_definition *_struct_definition_new(struct bt_declaration *declaration,
                                struct definition_scope *parent_scope,
                                GQuark field_name, int index,
                                const char *root_name);
 static
-void _struct_definition_free(struct definition *definition);
+void _struct_definition_free(struct bt_definition *definition);
 
-int bt_struct_rw(struct stream_pos *ppos, struct definition *definition)
+int bt_struct_rw(struct bt_stream_pos *ppos, struct bt_definition *definition)
 {
        struct definition_struct *struct_definition =
                container_of(definition, struct definition_struct, p);
@@ -51,7 +51,7 @@ int bt_struct_rw(struct stream_pos *ppos, struct definition *definition)
        int ret;
 
        for (i = 0; i < struct_definition->fields->len; i++) {
-               struct definition *field =
+               struct bt_definition *field =
                        g_ptr_array_index(struct_definition->fields, i);
                ret = generic_rw(ppos, field);
                if (ret)
@@ -61,13 +61,13 @@ int bt_struct_rw(struct stream_pos *ppos, struct definition *definition)
 }
 
 static
-void _struct_declaration_free(struct declaration *declaration)
+void _struct_declaration_free(struct bt_declaration *declaration)
 {
        struct declaration_struct *struct_declaration =
                container_of(declaration, struct declaration_struct, p);
        unsigned long i;
 
-       free_declaration_scope(struct_declaration->scope);
+       bt_free_declaration_scope(struct_declaration->scope);
        g_hash_table_destroy(struct_declaration->fields_by_name);
 
        for (i = 0; i < struct_declaration->fields->len; i++) {
@@ -85,7 +85,7 @@ struct declaration_struct *
                               uint64_t min_align)
 {
        struct declaration_struct *struct_declaration;
-       struct declaration *declaration;
+       struct bt_declaration *declaration;
 
        struct_declaration = g_new(struct declaration_struct, 1);
        declaration = &struct_declaration->p;
@@ -94,7 +94,7 @@ struct declaration_struct *
        struct_declaration->fields = g_array_sized_new(FALSE, TRUE,
                                                sizeof(struct declaration_field),
                                                DEFAULT_NR_STRUCT_FIELDS);
-       struct_declaration->scope = new_declaration_scope(parent_scope);
+       struct_declaration->scope = bt_new_declaration_scope(parent_scope);
        declaration->id = CTF_TYPE_STRUCT;
        declaration->alignment = max(1, min_align);
        declaration->declaration_free = _struct_declaration_free;
@@ -105,8 +105,8 @@ struct declaration_struct *
 }
 
 static
-struct definition *
-       _struct_definition_new(struct declaration *declaration,
+struct bt_definition *
+       _struct_definition_new(struct bt_declaration *declaration,
                               struct definition_scope *parent_scope,
                               GQuark field_name, int index,
                               const char *root_name)
@@ -128,10 +128,10 @@ struct definition *
         */
        _struct->p.index = root_name ? INT_MAX : index;
        _struct->p.name = field_name;
-       _struct->p.path = new_definition_path(parent_scope, field_name, root_name);
-       _struct->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+       _struct->p.path = bt_new_definition_path(parent_scope, field_name, root_name);
+       _struct->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name);
 
-       ret = register_field_definition(field_name, &_struct->p,
+       ret = bt_register_field_definition(field_name, &_struct->p,
                                        parent_scope);
        assert(!ret || ret == -EPERM);
 
@@ -141,8 +141,8 @@ struct definition *
                struct declaration_field *declaration_field =
                        &g_array_index(struct_declaration->fields,
                                       struct declaration_field, i);
-               struct definition **field =
-                       (struct definition **) &g_ptr_array_index(_struct->fields, i);
+               struct bt_definition **field =
+                       (struct bt_definition **) &g_ptr_array_index(_struct->fields, i);
 
                *field = declaration_field->declaration->definition_new(declaration_field->declaration,
                                                          _struct->p.scope,
@@ -154,17 +154,17 @@ struct definition *
 
 error:
        for (i--; i >= 0; i--) {
-               struct definition *field = g_ptr_array_index(_struct->fields, i);
+               struct bt_definition *field = g_ptr_array_index(_struct->fields, i);
                bt_definition_unref(field);
        }
-       free_definition_scope(_struct->p.scope);
+       bt_free_definition_scope(_struct->p.scope);
        bt_declaration_unref(&struct_declaration->p);
        g_free(_struct);
        return NULL;
 }
 
 static
-void _struct_definition_free(struct definition *definition)
+void _struct_definition_free(struct bt_definition *definition)
 {
        struct definition_struct *_struct =
                container_of(definition, struct definition_struct, p);
@@ -172,10 +172,10 @@ void _struct_definition_free(struct definition *definition)
 
        assert(_struct->fields->len == _struct->declaration->fields->len);
        for (i = 0; i < _struct->fields->len; i++) {
-               struct definition *field = g_ptr_array_index(_struct->fields, i);
+               struct bt_definition *field = g_ptr_array_index(_struct->fields, i);
                bt_definition_unref(field);
        }
-       free_definition_scope(_struct->p.scope);
+       bt_free_definition_scope(_struct->p.scope);
        bt_declaration_unref(_struct->p.declaration);
        g_ptr_array_free(_struct->fields, TRUE);
        g_free(_struct);
@@ -183,7 +183,7 @@ void _struct_definition_free(struct definition *definition)
 
 void bt_struct_declaration_add_field(struct declaration_struct *struct_declaration,
                           const char *field_name,
-                          struct declaration *field_declaration)
+                          struct bt_declaration *field_declaration)
 {
        struct declaration_field *field;
        unsigned long index;
@@ -241,8 +241,8 @@ struct declaration_field *
 /*
  * field returned only valid as long as the field structure is not appended to.
  */
-struct definition *
-bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
+struct bt_definition *
+bt_struct_definition_get_field_from_index(const struct definition_struct *_struct,
                                        int index)
 {
        if (index < 0)
@@ -250,7 +250,7 @@ bt_struct_definition_get_field_from_index(struct definition_struct *_struct,
        return g_ptr_array_index(_struct->fields, index);
 }
 
-uint64_t bt_struct_declaration_len(struct declaration_struct *struct_declaration)
+uint64_t bt_struct_declaration_len(const struct declaration_struct *struct_declaration)
 {
        return struct_declaration->fields->len;
 }