X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=ebaf43c1fdd463cff09e669627b60adc14950627;hp=8a781f67c0df03af2a114b7fdddbd2d5b6ae509f;hb=bf78e2cf834756c64e0dfd8b38916c4c827bf0d6;hpb=312623540c466defab45503fbe0ce7ec79dcce85 diff --git a/types/variant.c b/types/variant.c index 8a781f67..ebaf43c1 100644 --- a/types/variant.c +++ b/types/variant.c @@ -3,7 +3,9 @@ * * BabelTrace - Variant Type Converter * - * Copyright 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,26 +16,36 @@ * * 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 static struct definition *_variant_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 _variant_definition_free(struct definition *definition); -int variant_rw(struct stream_pos *ppos, struct definition *definition) +int bt_variant_rw(struct stream_pos *ppos, struct definition *definition) { struct definition_variant *variant_definition = container_of(definition, struct definition_variant, p); struct definition *field; - field = variant_get_current_field(variant_definition); + field = bt_variant_get_current_field(variant_definition); return generic_rw(ppos, field); } @@ -44,20 +56,20 @@ void _untagged_variant_declaration_free(struct declaration *declaration) container_of(declaration, struct declaration_untagged_variant, p); unsigned long i; - free_declaration_scope(untagged_variant_declaration->scope); + bt_free_declaration_scope(untagged_variant_declaration->scope); g_hash_table_destroy(untagged_variant_declaration->fields_by_tag); for (i = 0; i < untagged_variant_declaration->fields->len; i++) { struct declaration_field *declaration_field = &g_array_index(untagged_variant_declaration->fields, struct declaration_field, i); - declaration_unref(declaration_field->declaration); + bt_declaration_unref(declaration_field->declaration); } g_array_free(untagged_variant_declaration->fields, true); g_free(untagged_variant_declaration); } -struct declaration_untagged_variant *untagged_variant_declaration_new( +struct declaration_untagged_variant *bt_untagged_bt_variant_declaration_new( struct declaration_scope *parent_scope) { struct declaration_untagged_variant *untagged_variant_declaration; @@ -70,7 +82,7 @@ struct declaration_untagged_variant *untagged_variant_declaration_new( untagged_variant_declaration->fields = g_array_sized_new(FALSE, TRUE, sizeof(struct declaration_field), DEFAULT_NR_STRUCT_FIELDS); - untagged_variant_declaration->scope = new_declaration_scope(parent_scope); + untagged_variant_declaration->scope = bt_new_declaration_scope(parent_scope); declaration->id = CTF_TYPE_UNTAGGED_VARIANT; declaration->alignment = 1; declaration->declaration_free = _untagged_variant_declaration_free; @@ -86,12 +98,13 @@ void _variant_declaration_free(struct declaration *declaration) struct declaration_variant *variant_declaration = container_of(declaration, struct declaration_variant, p); - _untagged_variant_declaration_free(&variant_declaration->untagged_variant->p); + bt_declaration_unref(&variant_declaration->untagged_variant->p); g_array_free(variant_declaration->tag_name, TRUE); + g_free(variant_declaration); } struct declaration_variant * - variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag) + bt_variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag) { struct declaration_variant *variant_declaration; struct declaration *declaration; @@ -99,8 +112,9 @@ struct declaration_variant * variant_declaration = g_new(struct declaration_variant, 1); declaration = &variant_declaration->p; variant_declaration->untagged_variant = untagged_variant; + bt_declaration_ref(&untagged_variant->p); variant_declaration->tag_name = g_array_new(FALSE, TRUE, sizeof(GQuark)); - append_scope_path(tag, variant_declaration->tag_name); + bt_append_scope_path(tag, variant_declaration->tag_name); declaration->id = CTF_TYPE_VARIANT; declaration->alignment = 1; declaration->declaration_free = _variant_declaration_free; @@ -130,14 +144,14 @@ int check_enum_tag(struct definition_variant *variant, * variant choice map to an enumerator too. We then validate that the * number of enumerators equals the number of variant choices. */ - if (variant->declaration->untagged_variant->fields->len != enum_get_nr_enumerators(enum_declaration)) + if (variant->declaration->untagged_variant->fields->len != bt_enum_get_nr_enumerators(enum_declaration)) return -EPERM; for (i = 0; i < variant->declaration->untagged_variant->fields->len; i++) { struct declaration_field *field_declaration = &g_array_index(variant->declaration->untagged_variant->fields, struct declaration_field, i); - if (!enum_quark_to_range_set(enum_declaration, field_declaration->name)) { + if (!bt_enum_quark_to_range_set(enum_declaration, field_declaration->name)) { missing_field = 1; break; } @@ -161,30 +175,41 @@ static struct definition * _variant_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_variant *variant_declaration = container_of(declaration, struct declaration_variant, p); struct definition_variant *variant; unsigned long i; + int ret; variant = g_new(struct definition_variant, 1); - declaration_ref(&variant_declaration->p); + bt_declaration_ref(&variant_declaration->p); variant->p.declaration = declaration; variant->declaration = variant_declaration; variant->p.ref = 1; - variant->p.index = index; + /* + * Use INT_MAX order to ensure that all fields of the parent + * scope are seen as being prior to this scope. + */ + variant->p.index = root_name ? INT_MAX : index; variant->p.name = field_name; - variant->p.path = new_definition_path(parent_scope, field_name); - variant->scope = new_definition_scope(parent_scope, field_name); - variant->enum_tag = lookup_definition(variant->scope->scope_path, - variant_declaration->tag_name, - parent_scope); + variant->p.path = bt_new_definition_path(parent_scope, field_name, root_name); + variant->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + + ret = bt_register_field_definition(field_name, &variant->p, + parent_scope); + assert(!ret); + + variant->enum_tag = bt_lookup_path_definition(variant->p.scope->scope_path, + variant_declaration->tag_name, + parent_scope); if (!variant->enum_tag || check_enum_tag(variant, variant->enum_tag) < 0) goto error; - definition_ref(variant->enum_tag); + bt_definition_ref(variant->enum_tag); variant->fields = g_ptr_array_sized_new(variant_declaration->untagged_variant->fields->len); g_ptr_array_set_size(variant->fields, variant_declaration->untagged_variant->fields->len); for (i = 0; i < variant_declaration->untagged_variant->fields->len; i++) { @@ -199,14 +224,16 @@ struct definition * * various choices of the same field. */ *field = declaration_field->declaration->definition_new(declaration_field->declaration, - variant->scope, - declaration_field->name, 0); + variant->p.scope, + declaration_field->name, 0, NULL); + if (!*field) + goto error; } variant->current_field = NULL; return &variant->p; error: - free_definition_scope(variant->scope); - declaration_unref(&variant_declaration->p); + bt_free_definition_scope(variant->p.scope); + bt_declaration_unref(&variant_declaration->p); g_free(variant); return NULL; } @@ -221,15 +248,16 @@ void _variant_definition_free(struct definition *definition) assert(variant->fields->len == variant->declaration->untagged_variant->fields->len); for (i = 0; i < variant->fields->len; i++) { struct definition *field = g_ptr_array_index(variant->fields, i); - definition_unref(field); + bt_definition_unref(field); } - definition_unref(variant->enum_tag); - free_definition_scope(variant->scope); - declaration_unref(variant->p.declaration); + bt_definition_unref(variant->enum_tag); + bt_free_definition_scope(variant->p.scope); + bt_declaration_unref(variant->p.declaration); + g_ptr_array_free(variant->fields, TRUE); g_free(variant); } -void untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration, +void bt_untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration, const char *field_name, struct declaration *field_declaration) { @@ -240,7 +268,7 @@ void untagged_variant_declaration_add_field(struct declaration_untagged_variant index = untagged_variant_declaration->fields->len - 1; /* last field (new) */ field = &g_array_index(untagged_variant_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(untagged_variant_declaration->fields_by_tag, @@ -254,19 +282,26 @@ void untagged_variant_declaration_add_field(struct declaration_untagged_variant } struct declaration_field * -untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag) +bt_untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag) { - unsigned long index; + gpointer index; + gboolean found; - index = (unsigned long) g_hash_table_lookup(untagged_variant_declaration->fields_by_tag, - (gconstpointer) (unsigned long) tag); - return &g_array_index(untagged_variant_declaration->fields, struct declaration_field, index); + found = g_hash_table_lookup_extended( + untagged_variant_declaration->fields_by_tag, + (gconstpointer) (unsigned long) tag, NULL, &index); + + if (!found) { + return NULL; + } + + return &g_array_index(untagged_variant_declaration->fields, struct declaration_field, (unsigned long)index); } /* * field returned only valid as long as the field structure is not appended to. */ -struct definition *variant_get_current_field(struct definition_variant *variant) +struct definition *bt_variant_get_current_field(struct definition_variant *variant) { struct definition_enum *_enum = container_of(variant->enum_tag, struct definition_enum, p);