/*
- * variant.c
+* variant.c
*
* BabelTrace - Variant Type Converter
*
#include <babeltrace/compiler.h>
#include <babeltrace/format.h>
-
+#include <errno.h>
static
-struct declaration *_variant_declaration_new(struct type *type,
- struct declaration_scope *parent_scope);
+struct definition *_variant_definition_new(struct type *type,
+ struct definition_scope *parent_scope);
static
-void _variant_declaration_free(struct declaration *declaration);
+void _variant_definition_free(struct definition *definition);
void variant_copy(struct stream_pos *dest, const struct format *fdest,
struct stream_pos *src, const struct format *fsrc,
- struct declaration *declaration)
+ struct definition *definition)
{
- struct declaration_variant *variant =
- container_of(declaration, struct declaration_variant, p);
+ struct definition_variant *variant =
+ container_of(definition, struct definition_variant, p);
struct type_variant *variant_type = variant->type;
struct field *field;
struct type *field_type;
- unsigned long i;
fsrc->variant_begin(src, variant_type);
fdest->variant_begin(dest, variant_type);
field = variant_get_current_field(variant);
- field_type = field->type->p.type;
- field_type->copy(dest, fdest, src, fsrc, &field->type->p);
+ field_type = field->definition->type;
+ field_type->copy(dest, fdest, src, fsrc, field->definition);
fsrc->variant_end(src, variant_type);
fdest->variant_end(dest, variant_type);
container_of(type, struct type_variant, p);
unsigned long i;
+ free_type_scope(variant_type->scope);
g_hash_table_destroy(variant_type->fields_by_tag);
for (i = 0; i < variant_type->fields->len; i++) {
- struct field *type_field =
+ struct type_field *type_field =
&g_array_index(variant_type->fields,
struct type_field, i);
- type_unref(field->type);
+ type_unref(type_field->type);
}
g_array_free(variant_type->fields, true);
g_free(variant_type);
}
-struct type_variant *variant_type_new(const char *name)
+struct type_variant *variant_type_new(const char *name,
+ struct type_scope *parent_scope)
{
struct type_variant *variant_type;
struct type *type;
- int ret;
variant_type = g_new(struct type_variant, 1);
type = &variant_type->p;
variant_type->fields = g_array_sized_new(FALSE, TRUE,
sizeof(struct type_field),
DEFAULT_NR_STRUCT_FIELDS);
+ variant_type->scope = new_type_scope(parent_scope);
+ type->id = CTF_TYPE_VARIANT;
type->name = g_quark_from_string(name);
type->alignment = 1;
type->copy = variant_copy;
type->type_free = _variant_type_free;
- type->declaration_new = _variant_declaration_new;
- type->declaration_free = _variant_declaration_free;
+ type->definition_new = _variant_definition_new;
+ type->definition_free = _variant_definition_free;
type->ref = 1;
-
- if (type->name) {
- ret = register_type(type);
- if (ret)
- goto error_register;
- }
return variant_type;
-
-error_register:
- g_hash_table_destroy(variant_type->fields_by_tag);
- g_array_free(variant_type->fields, true);
- g_free(variant_type);
- return NULL;
}
static
-struct declaration *
- _variant_declaration_new(struct type *type,
- struct declaration_scope *parent_scope)
+struct definition *
+ _variant_definition_new(struct type *type,
+ struct definition_scope *parent_scope)
{
struct type_variant *variant_type =
container_of(type, struct type_variant, p);
- struct declaration_variant *variant;
+ struct definition_variant *variant;
+ unsigned long i;
- variant = g_new(struct declaration_variant, 1);
+ variant = g_new(struct definition_variant, 1);
type_ref(&variant_type->p);
- variant->p.type = variant_type;
+ variant->p.type = type;
+ variant->type = variant_type;
variant->p.ref = 1;
- variant->scope = new_declaration_scope(parent_scope);
+ variant->scope = new_definition_scope(parent_scope);
variant->fields = g_array_sized_new(FALSE, TRUE,
sizeof(struct field),
DEFAULT_NR_STRUCT_FIELDS);
+ g_array_set_size(variant->fields, variant_type->fields->len);
+ for (i = 0; i < variant_type->fields->len; i++) {
+ struct type_field *type_field =
+ &g_array_index(variant_type->fields,
+ struct type_field, i);
+ struct field *field = &g_array_index(variant->fields,
+ struct field, i);
+
+ field->name = type_field->name;
+ field->definition =
+ type_field->type->definition_new(type_field->type,
+ variant->scope);
+ }
variant->current_field = NULL;
return &variant->p;
}
static
-void variant_declaration_free(struct declaration *declaration)
+void _variant_definition_free(struct definition *definition)
{
- struct declaration_variant *variant =
- container_of(declaration, struct declaration_variant, p);
+ struct definition_variant *variant =
+ container_of(definition, struct definition_variant, p);
unsigned long i;
+ assert(variant->fields->len == variant->type->fields->len);
for (i = 0; i < variant->fields->len; i++) {
struct field *field = &g_array_index(variant->fields,
struct field, i);
- declaration_unref(field->declaration);
+ definition_unref(field->definition);
}
- free_declaration_scope(variant->scope);
+ free_definition_scope(variant->scope);
type_unref(variant->p.type);
g_free(variant);
}
type_ref(tag_type);
field->type = tag_type;
/* Keep index in hash rather than pointer, because array can relocate */
- g_hash_table_insert(variant_type->fields_by_name,
+ g_hash_table_insert(variant_type->fields_by_tag,
(gpointer) (unsigned long) field->name,
(gpointer) index);
/*
/*
* tag_instance is assumed to be an enumeration.
*/
-int variant_declaration_set_tag(struct declaration_variant *variant,
- struct declaration *enum_tag)
+int variant_definition_set_tag(struct definition_variant *variant,
+ struct definition *enum_tag)
{
- struct declaration_enum *_enum =
- container_of(variant->enum_tag, struct declaration_enum, p);
+ struct definition_enum *_enum =
+ container_of(variant->enum_tag, struct definition_enum, p);
struct type_enum *enum_type = _enum->type;
int missing_field = 0;
unsigned long i;
/*
* field returned only valid as long as the field structure is not appended to.
*/
-struct field *variant_get_current_field(struct declaration_variant *variant)
+struct field *variant_get_current_field(struct definition_variant *variant)
{
- struct declaration_enum *_enum =
- container_of(variant->enum_tag, struct declaration_enum, p);
- struct variant_type *variant_type = variant->type;
+ struct definition_enum *_enum =
+ container_of(variant->enum_tag, struct definition_enum, p);
+ struct type_variant *variant_type = variant->type;
unsigned long index;
GArray *tag_array;
GQuark tag;
projects / babeltrace.git / blobdiff