X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=3972d787275fc47298319be6d290855045da00ae;hp=47c821ecd9fb6b1619499eb7a018004175b376a9;hb=4a6f6ed3aeb9845dec4b8ec9ca8573ed1c064187;hpb=2399b6f48012dd60cb48f87b60fc1cc698a56fdc diff --git a/types/variant.c b/types/variant.c index 47c821ec..3972d787 100644 --- a/types/variant.c +++ b/types/variant.c @@ -32,31 +32,34 @@ #include static -struct definition *_variant_definition_new(struct declaration *declaration, +struct bt_definition *_variant_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name); static -void _variant_definition_free(struct definition *definition); +void _variant_definition_free(struct bt_definition *definition); -int variant_rw(struct stream_pos *ppos, struct definition *definition) +int bt_variant_rw(struct bt_stream_pos *ppos, struct bt_definition *definition) { struct definition_variant *variant_definition = container_of(definition, struct definition_variant, p); - struct definition *field; + struct bt_definition *field; - field = variant_get_current_field(variant_definition); + field = bt_variant_get_current_field(variant_definition); + if (!field) { + return -EINVAL; + } return generic_rw(ppos, field); } static -void _untagged_variant_declaration_free(struct declaration *declaration) +void _untagged_variant_declaration_free(struct bt_declaration *declaration) { struct declaration_untagged_variant *untagged_variant_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++) { @@ -69,11 +72,11 @@ void _untagged_variant_declaration_free(struct declaration *declaration) 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; - struct declaration *declaration; + struct bt_declaration *declaration; untagged_variant_declaration = g_new(struct declaration_untagged_variant, 1); declaration = &untagged_variant_declaration->p; @@ -82,7 +85,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; @@ -93,7 +96,7 @@ struct declaration_untagged_variant *untagged_variant_declaration_new( } static -void _variant_declaration_free(struct declaration *declaration) +void _variant_declaration_free(struct bt_declaration *declaration) { struct declaration_variant *variant_declaration = container_of(declaration, struct declaration_variant, p); @@ -104,10 +107,10 @@ void _variant_declaration_free(struct declaration *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; + struct bt_declaration *declaration; variant_declaration = g_new(struct declaration_variant, 1); declaration = &variant_declaration->p; @@ -124,56 +127,9 @@ struct declaration_variant * return variant_declaration; } -/* - * tag_instance is assumed to be an enumeration. - * Returns 0 if OK, < 0 if error. - */ -static -int check_enum_tag(struct definition_variant *variant, - struct definition *enum_tag) -{ - struct definition_enum *_enum = - container_of(enum_tag, struct definition_enum, p); - struct declaration_enum *enum_declaration = _enum->declaration; - int missing_field = 0; - unsigned long i; - - /* - * Strictly speaking, each enumerator must map to a field of the - * variant. However, we are even stricter here by requiring that each - * 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 != 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 (!bt_enum_quark_to_range_set(enum_declaration, field_declaration->name)) { - missing_field = 1; - break; - } - } - if (missing_field) - return -EPERM; - - /* - * Check the enumeration: it must map each value to one and only one - * enumerator tag. - * TODO: we should also check that each range map to one and only one - * tag. For the moment, we will simply check this dynamically in - * variant_declaration_get_current_field(). - */ - return 0; -} - - - static -struct definition * - _variant_definition_new(struct declaration *declaration, +struct bt_definition * + _variant_definition_new(struct bt_declaration *declaration, struct definition_scope *parent_scope, GQuark field_name, int index, const char *root_name) @@ -195,19 +151,18 @@ struct definition * */ variant->p.index = root_name ? INT_MAX : index; variant->p.name = field_name; - variant->p.path = new_definition_path(parent_scope, field_name, root_name); - variant->p.scope = new_definition_scope(parent_scope, field_name, root_name); + 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 = register_field_definition(field_name, &variant->p, + ret = bt_register_field_definition(field_name, &variant->p, parent_scope); assert(!ret); - variant->enum_tag = lookup_path_definition(variant->p.scope->scope_path, + 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) + if (!variant->enum_tag) goto error; bt_definition_ref(variant->enum_tag); variant->fields = g_ptr_array_sized_new(variant_declaration->untagged_variant->fields->len); @@ -216,8 +171,8 @@ struct definition * struct declaration_field *declaration_field = &g_array_index(variant_declaration->untagged_variant->fields, struct declaration_field, i); - struct definition **field = - (struct definition **) &g_ptr_array_index(variant->fields, i); + struct bt_definition **field = + (struct bt_definition **) &g_ptr_array_index(variant->fields, i); /* * All child definition are at index 0, because they are @@ -232,14 +187,14 @@ struct definition * variant->current_field = NULL; return &variant->p; error: - free_definition_scope(variant->p.scope); + bt_free_definition_scope(variant->p.scope); bt_declaration_unref(&variant_declaration->p); g_free(variant); return NULL; } static -void _variant_definition_free(struct definition *definition) +void _variant_definition_free(struct bt_definition *definition) { struct definition_variant *variant = container_of(definition, struct definition_variant, p); @@ -247,19 +202,19 @@ 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); + struct bt_definition *field = g_ptr_array_index(variant->fields, i); bt_definition_unref(field); } bt_definition_unref(variant->enum_tag); - free_definition_scope(variant->p.scope); + 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) + struct bt_declaration *field_declaration) { struct declaration_field *field; unsigned long index; @@ -282,7 +237,7 @@ 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) { gpointer index; gboolean found; @@ -301,7 +256,7 @@ untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_vari /* * 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 bt_definition *bt_variant_get_current_field(struct definition_variant *variant) { struct definition_enum *_enum = container_of(variant->enum_tag, struct definition_enum, p); @@ -309,16 +264,30 @@ struct definition *variant_get_current_field(struct definition_variant *variant) unsigned long index; GArray *tag_array; GQuark tag; + gpointer orig_key, value; tag_array = _enum->value; + if (!tag_array) { + /* Enumeration has unknown tag. */ + fprintf(stderr, "[error] Enumeration used for variant has unknown tag.\n"); + return NULL; + } /* * The 1 to 1 mapping from enumeration to value should have been already * checked. (see TODO above) */ assert(tag_array->len == 1); tag = g_array_index(tag_array, GQuark, 0); - index = (unsigned long) g_hash_table_lookup(variant_declaration->untagged_variant->fields_by_tag, - (gconstpointer) (unsigned long) tag); + if (!g_hash_table_lookup_extended(variant_declaration->untagged_variant->fields_by_tag, + (gconstpointer) (unsigned long) tag, + &orig_key, + &value)) { + /* Cannot find matching field. */ + fprintf(stderr, "[error] Cannot find matching field for enum field \"%s\" in variant.\n", + g_quark_to_string(tag)); + return NULL; + } + index = (unsigned long) value; variant->current_field = g_ptr_array_index(variant->fields, index); return variant->current_field; }