X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fstruct.c;h=76b82d2c8c9a9af569b5ee38582e277721ae0ee5;hp=6012447bc2a678194aa4ba5dc8a278ea3e58073e;hb=becd02a104b8c1634ce914d1d2cd36be932b9b16;hpb=312623540c466defab45503fbe0ce7ec79dcce85 diff --git a/types/struct.c b/types/struct.c index 6012447b..76b82d2c 100644 --- a/types/struct.c +++ b/types/struct.c @@ -3,7 +3,9 @@ * * BabelTrace - Structure Type Converter * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -14,10 +16,20 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include +#include #ifndef max #define max(a, b) ((a) < (b) ? (b) : (a)) @@ -26,11 +38,12 @@ static struct definition *_struct_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 _struct_definition_free(struct definition *definition); -int struct_rw(struct stream_pos *ppos, struct definition *definition) +int bt_struct_rw(struct stream_pos *ppos, struct definition *definition) { struct definition_struct *struct_definition = container_of(definition, struct definition_struct, p); @@ -54,21 +67,22 @@ void _struct_declaration_free(struct declaration *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++) { struct declaration_field *declaration_field = &g_array_index(struct_declaration->fields, struct declaration_field, i); - declaration_unref(declaration_field->declaration); + bt_declaration_unref(declaration_field->declaration); } g_array_free(struct_declaration->fields, true); g_free(struct_declaration); } struct declaration_struct * - struct_declaration_new(struct declaration_scope *parent_scope) + bt_struct_declaration_new(struct declaration_scope *parent_scope, + uint64_t min_align) { struct declaration_struct *struct_declaration; struct declaration *declaration; @@ -80,9 +94,9 @@ 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 = 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; @@ -94,23 +108,33 @@ static struct definition * _struct_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_struct *struct_declaration = container_of(declaration, struct declaration_struct, p); struct definition_struct *_struct; - unsigned long i; + int i; int ret; _struct = g_new(struct definition_struct, 1); - declaration_ref(&struct_declaration->p); + bt_declaration_ref(&struct_declaration->p); _struct->p.declaration = declaration; _struct->declaration = struct_declaration; _struct->p.ref = 1; - _struct->p.index = index; + /* + * Use INT_MAX order to ensure that all fields of the parent + * scope are seen as being prior to this scope. + */ + _struct->p.index = root_name ? INT_MAX : index; _struct->p.name = field_name; - _struct->p.path = new_definition_path(parent_scope, field_name); - _struct->scope = new_definition_scope(parent_scope, 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); + + ret = register_field_definition(field_name, &_struct->p, + parent_scope); + assert(!ret || ret == -EPERM); + _struct->fields = g_ptr_array_sized_new(DEFAULT_NR_STRUCT_FIELDS); g_ptr_array_set_size(_struct->fields, struct_declaration->fields->len); for (i = 0; i < struct_declaration->fields->len; i++) { @@ -121,14 +145,22 @@ struct definition * (struct definition **) &g_ptr_array_index(_struct->fields, i); *field = declaration_field->declaration->definition_new(declaration_field->declaration, - _struct->scope, - declaration_field->name, i); - ret = register_field_definition(declaration_field->name, - *field, - _struct->scope); - assert(!ret); + _struct->p.scope, + declaration_field->name, i, NULL); + if (!*field) + goto error; } return &_struct->p; + +error: + for (i--; i >= 0; i--) { + struct definition *field = g_ptr_array_index(_struct->fields, i); + bt_definition_unref(field); + } + free_definition_scope(_struct->p.scope); + bt_declaration_unref(&struct_declaration->p); + g_free(_struct); + return NULL; } static @@ -141,14 +173,15 @@ 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); - definition_unref(field); + bt_definition_unref(field); } - free_definition_scope(_struct->scope); - declaration_unref(_struct->p.declaration); + free_definition_scope(_struct->p.scope); + bt_declaration_unref(_struct->p.declaration); + g_ptr_array_free(_struct->fields, TRUE); g_free(_struct); } -void struct_declaration_add_field(struct declaration_struct *struct_declaration, +void bt_struct_declaration_add_field(struct declaration_struct *struct_declaration, const char *field_name, struct declaration *field_declaration) { @@ -159,7 +192,7 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration, index = struct_declaration->fields->len - 1; /* last field (new) */ field = &g_array_index(struct_declaration->fields, struct declaration_field, index); field->name = g_quark_from_string(field_name); - declaration_ref(field_declaration); + bt_declaration_ref(field_declaration); field->declaration = field_declaration; /* Keep index in hash rather than pointer, because array can relocate */ g_hash_table_insert(struct_declaration->fields_by_name, @@ -174,12 +207,12 @@ void struct_declaration_add_field(struct declaration_struct *struct_declaration, } /* - * struct_declaration_lookup_field_index - returns field index + * bt_struct_declaration_lookup_field_index - returns field index * * Returns the index of a field in a structure, or -1 if it does not * exist. */ -int struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration, +int bt_struct_declaration_lookup_field_index(struct declaration_struct *struct_declaration, GQuark field_name) { gpointer index; @@ -197,7 +230,7 @@ int struct_declaration_lookup_field_index(struct declaration_struct *struct_decl * field returned only valid as long as the field structure is not appended to. */ struct declaration_field * - struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration, + bt_struct_declaration_get_field_from_index(struct declaration_struct *struct_declaration, int index) { if (index < 0) @@ -209,10 +242,15 @@ struct declaration_field * * field returned only valid as long as the field structure is not appended to. */ struct definition * -struct_definition_get_field_from_index(struct definition_struct *_struct, +bt_struct_definition_get_field_from_index(struct definition_struct *_struct, int index) { if (index < 0) return NULL; return g_ptr_array_index(_struct->fields, index); } + +uint64_t bt_struct_declaration_len(struct declaration_struct *struct_declaration) +{ + return struct_declaration->fields->len; +}