*
* BabelTrace - Variant Type Converter
*
- * Copyright 2011 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation
+ *
+ * Author: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
*
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
#include <babeltrace/compiler.h>
#include <babeltrace/format.h>
+#include <babeltrace/types.h>
#include <errno.h>
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);
-void variant_rw(struct stream_pos *ppos, struct definition *definition)
+int variant_rw(struct stream_pos *ppos, struct definition *definition)
{
struct definition_variant *variant_definition =
container_of(definition, struct definition_variant, p);
- struct field *field;
+ struct definition *field;
field = variant_get_current_field(variant_definition);
- generic_rw(ppos, field->definition);
+ return generic_rw(ppos, field);
}
static
variant_declaration = g_new(struct declaration_variant, 1);
declaration = &variant_declaration->p;
variant_declaration->untagged_variant = untagged_variant;
+ declaration_ref(&untagged_variant->p);
variant_declaration->tag_name = g_array_new(FALSE, TRUE, sizeof(GQuark));
append_scope_path(tag, variant_declaration->tag_name);
declaration->id = CTF_TYPE_VARIANT;
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);
variant->p.declaration = declaration;
variant->declaration = variant_declaration;
variant->p.ref = 1;
- variant->p.index = index;
- variant->scope = new_definition_scope(parent_scope, field_name);
- variant->enum_tag = lookup_definition(variant->scope->scope_path,
- variant_declaration->tag_name,
- parent_scope);
+ /*
+ * 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, root_name);
+ variant->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+
+ ret = register_field_definition(field_name, &variant->p,
+ parent_scope);
+ assert(!ret);
+
+ variant->enum_tag = 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);
- variant->fields = g_array_sized_new(FALSE, TRUE,
- sizeof(struct field),
- variant_declaration->untagged_variant->fields->len);
- g_array_set_size(variant->fields, variant_declaration->untagged_variant->fields->len);
+ 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++) {
struct declaration_field *declaration_field =
&g_array_index(variant_declaration->untagged_variant->fields,
struct declaration_field, i);
- struct field *field = &g_array_index(variant->fields,
- struct field, i);
+ struct definition **field =
+ (struct definition **) &g_ptr_array_index(variant->fields, i);
- field->name = declaration_field->name;
/*
* All child definition are at index 0, because they are
* various choices of the same field.
*/
- field->definition =
- declaration_field->declaration->definition_new(declaration_field->declaration,
- variant->scope,
- field->name, 0);
+ *field = declaration_field->declaration->definition_new(declaration_field->declaration,
+ 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);
+ free_definition_scope(variant->p.scope);
declaration_unref(&variant_declaration->p);
g_free(variant);
return NULL;
assert(variant->fields->len == variant->declaration->untagged_variant->fields->len);
for (i = 0; i < variant->fields->len; i++) {
- struct field *field = &g_array_index(variant->fields,
- struct field, i);
- definition_unref(field->definition);
+ struct definition *field = g_ptr_array_index(variant->fields, i);
+ definition_unref(field);
}
definition_unref(variant->enum_tag);
- free_definition_scope(variant->scope);
+ free_definition_scope(variant->p.scope);
declaration_unref(variant->p.declaration);
g_free(variant);
}
struct declaration_field *
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 field *variant_get_current_field(struct definition_variant *variant)
+struct definition *variant_get_current_field(struct definition_variant *variant)
{
struct definition_enum *_enum =
container_of(variant->enum_tag, struct definition_enum, p);
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);
- variant->current_field = &g_array_index(variant->fields, struct field, index);
+ variant->current_field = g_ptr_array_index(variant->fields, index);
return variant->current_field;
}
projects / babeltrace.git / blobdiff