X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fvariant.c;h=bb4faa17093a87ec0266f7f08349922037105e1b;hp=e522621be346e13cfe6cde920f74b7ae179f654d;hb=64fa3fec6c28f1d077812b4bfa06ae73b0f5999d;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/variant.c b/types/variant.c
index e522621b..bb4faa17 100644
--- a/types/variant.c
+++ b/types/variant.c
@@ -1,9 +1,11 @@
 /*
-* variant.c
+ * variant.c
  *
  * 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
@@ -22,69 +24,89 @@
 
 static
 struct definition *_variant_definition_new(struct declaration *declaration,
-				struct definition_scope *parent_scope);
+				struct definition_scope *parent_scope,
+				GQuark field_name, int index,
+				const char *root_name);
 static
 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 definition *definition)
+int variant_rw(struct stream_pos *ppos, struct definition *definition)
 {
-	struct definition_variant *variant =
+	struct definition_variant *variant_definition =
 		container_of(definition, struct definition_variant, p);
-	struct declaration_variant *variant_declaration = variant->declaration;
-	struct field *field;
-	struct declaration *field_declaration;
-
-	fsrc->variant_begin(src, variant_declaration);
-	fdest->variant_begin(dest, variant_declaration);
+	struct definition *field;
 
-	field = variant_get_current_field(variant);
-	field_declaration = field->definition->declaration;
-	field_declaration->copy(dest, fdest, src, fsrc, field->definition);
-
-	fsrc->variant_end(src, variant_declaration);
-	fdest->variant_end(dest, variant_declaration);
+	field = variant_get_current_field(variant_definition);
+	return generic_rw(ppos, field);
 }
 
 static
-void _variant_declaration_free(struct declaration *declaration)
+void _untagged_variant_declaration_free(struct declaration *declaration)
 {
-	struct declaration_variant *variant_declaration =
-		container_of(declaration, struct declaration_variant, p);
+	struct declaration_untagged_variant *untagged_variant_declaration =
+		container_of(declaration, struct declaration_untagged_variant, p);
 	unsigned long i;
 
-	free_declaration_scope(variant_declaration->scope);
-	g_hash_table_destroy(variant_declaration->fields_by_tag);
+	free_declaration_scope(untagged_variant_declaration->scope);
+	g_hash_table_destroy(untagged_variant_declaration->fields_by_tag);
 
-	for (i = 0; i < variant_declaration->fields->len; i++) {
+	for (i = 0; i < untagged_variant_declaration->fields->len; i++) {
 		struct declaration_field *declaration_field =
-			&g_array_index(variant_declaration->fields,
+			&g_array_index(untagged_variant_declaration->fields,
 				       struct declaration_field, i);
 		declaration_unref(declaration_field->declaration);
 	}
-	g_array_free(variant_declaration->fields, true);
-	g_free(variant_declaration);
+	g_array_free(untagged_variant_declaration->fields, true);
+	g_free(untagged_variant_declaration);
 }
 
-struct declaration_variant *variant_declaration_new(const char *name,
+struct declaration_untagged_variant *untagged_variant_declaration_new(
 				      struct declaration_scope *parent_scope)
 {
-	struct declaration_variant *variant_declaration;
+	struct declaration_untagged_variant *untagged_variant_declaration;
 	struct declaration *declaration;
 
-	variant_declaration = g_new(struct declaration_variant, 1);
-	declaration = &variant_declaration->p;
-	variant_declaration->fields_by_tag = g_hash_table_new(g_direct_hash,
+	untagged_variant_declaration = g_new(struct declaration_untagged_variant, 1);
+	declaration = &untagged_variant_declaration->p;
+	untagged_variant_declaration->fields_by_tag = g_hash_table_new(g_direct_hash,
 						       g_direct_equal);
-	variant_declaration->fields = g_array_sized_new(FALSE, TRUE,
+	untagged_variant_declaration->fields = g_array_sized_new(FALSE, TRUE,
 						 sizeof(struct declaration_field),
 						 DEFAULT_NR_STRUCT_FIELDS);
-	variant_declaration->scope = new_declaration_scope(parent_scope);
+	untagged_variant_declaration->scope = new_declaration_scope(parent_scope);
+	declaration->id = CTF_TYPE_UNTAGGED_VARIANT;
+	declaration->alignment = 1;
+	declaration->declaration_free = _untagged_variant_declaration_free;
+	declaration->definition_new = NULL;
+	declaration->definition_free = NULL;
+	declaration->ref = 1;
+	return untagged_variant_declaration;
+}
+
+static
+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);
+	g_array_free(variant_declaration->tag_name, TRUE);
+}
+
+struct declaration_variant *
+	variant_declaration_new(struct declaration_untagged_variant *untagged_variant, const char *tag)
+{
+	struct declaration_variant *variant_declaration;
+	struct declaration *declaration;
+
+	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;
-	declaration->name = g_quark_from_string(name);
 	declaration->alignment = 1;
-	declaration->copy = variant_copy;
 	declaration->declaration_free = _variant_declaration_free;
 	declaration->definition_new = _variant_definition_new;
 	declaration->definition_free = _variant_definition_free;
@@ -92,40 +114,118 @@ struct declaration_variant *variant_declaration_new(const char *name,
 	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 != 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)) {
+			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 definition_scope *parent_scope)
+				struct definition_scope *parent_scope,
+				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->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_declaration->fields->len);
-	for (i = 0; i < variant_declaration->fields->len; i++) {
+	/*
+	 * 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_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->fields,
+			&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;
-		field->definition =
-			declaration_field->declaration->definition_new(declaration_field->declaration,
-							  variant->scope);
+		/*
+		 * All child definition are at index 0, because they are
+		 * various choices of the same field.
+		 */
+		*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->p.scope);
+	declaration_unref(&variant_declaration->p);
+	g_free(variant);
+	return NULL;
 }
 
 static
@@ -135,32 +235,32 @@ void _variant_definition_free(struct definition *definition)
 		container_of(definition, struct definition_variant, p);
 	unsigned long i;
 
-	assert(variant->fields->len == variant->declaration->fields->len);
+	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);
 	}
-	free_definition_scope(variant->scope);
+	definition_unref(variant->enum_tag);
+	free_definition_scope(variant->p.scope);
 	declaration_unref(variant->p.declaration);
 	g_free(variant);
 }
 
-void variant_declaration_add_field(struct declaration_variant *variant_declaration,
-			    const char *tag_name,
-			    struct declaration *tag_declaration)
+void untagged_variant_declaration_add_field(struct declaration_untagged_variant *untagged_variant_declaration,
+			    const char *field_name,
+			    struct declaration *field_declaration)
 {
 	struct declaration_field *field;
 	unsigned long index;
 
-	g_array_set_size(variant_declaration->fields, variant_declaration->fields->len + 1);
-	index = variant_declaration->fields->len - 1;	/* last field (new) */
-	field = &g_array_index(variant_declaration->fields, struct declaration_field, index);
-	field->name = g_quark_from_string(tag_name);
-	declaration_ref(tag_declaration);
-	field->declaration = tag_declaration;
+	g_array_set_size(untagged_variant_declaration->fields, untagged_variant_declaration->fields->len + 1);
+	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);
+	field->declaration = field_declaration;
 	/* Keep index in hash rather than pointer, because array can relocate */
-	g_hash_table_insert(variant_declaration->fields_by_tag,
+	g_hash_table_insert(untagged_variant_declaration->fields_by_tag,
 			    (gpointer) (unsigned long) field->name,
 			    (gpointer) index);
 	/*
@@ -171,65 +271,19 @@ void variant_declaration_add_field(struct declaration_variant *variant_declarati
 }
 
 struct declaration_field *
-struct_declaration_get_field_from_tag(struct declaration_variant *variant_declaration, GQuark tag)
+untagged_variant_declaration_get_field_from_tag(struct declaration_untagged_variant *untagged_variant_declaration, GQuark tag)
 {
 	unsigned long index;
 
-	index = (unsigned long) g_hash_table_lookup(variant_declaration->fields_by_tag,
+	index = (unsigned long) g_hash_table_lookup(untagged_variant_declaration->fields_by_tag,
 						    (gconstpointer) (unsigned long) tag);
-	return &g_array_index(variant_declaration->fields, struct declaration_field, index);
-}
-
-/*
- * tag_instance is assumed to be an enumeration.
- */
-int variant_definition_set_tag(struct definition_variant *variant,
-			       struct definition *enum_tag)
-{
-	struct definition_enum *_enum =
-		container_of(variant->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->fields->len != enum_get_nr_enumerators(enum_declaration))
-		return -EPERM;
-
-	for (i = 0; i < variant->declaration->fields->len; i++) {
-		struct declaration_field *field_declaration =
-			&g_array_index(variant->declaration->fields,
-				       struct declaration_field, i);
-		if (!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().
-	 */
-
-	/* Set the enum tag field */
-	variant->enum_tag = enum_tag;
-	return 0;
+	return &g_array_index(untagged_variant_declaration->fields, struct declaration_field, 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);
@@ -245,8 +299,8 @@ struct field *variant_get_current_field(struct definition_variant *variant)
 	 */
 	assert(tag_array->len == 1);
 	tag = g_array_index(tag_array, GQuark, 0);
-	index = (unsigned long) g_hash_table_lookup(variant_declaration->fields_by_tag,
+	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;
 }