X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Fenum.c;h=1c71f9e660f7436782a7c80618a2f8b876f76bae;hp=67c23f0905983ad6bb5831b139d2eed9fc7e5a53;hb=7d11cac68520597dfe2cbb67f17a1340d41fc0d9;hpb=f66259163f060ada8d0fee348857c968e338ea40

diff --git a/types/enum.c b/types/enum.c
index 67c23f09..1c71f9e6 100644
--- a/types/enum.c
+++ b/types/enum.c
@@ -23,7 +23,9 @@
 
 static
 struct definition *_enum_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 _enum_definition_free(struct definition *definition);
 
@@ -348,31 +350,6 @@ size_t enum_get_nr_enumerators(struct declaration_enum *enum_declaration)
 	return g_hash_table_size(enum_declaration->table.quark_to_range_set);
 }
 
-void enum_copy(struct stream_pos *dest, const struct format *fdest, 
-	       struct stream_pos *src, const struct format *fsrc,
-	       struct definition *definition)
-{
-	struct definition_enum *_enum =
-		container_of(definition, struct definition_enum, p);
-	struct declaration_enum *enum_declaration= _enum->declaration;
-	GArray *array;
-	GQuark v;
-
-	array = fsrc->enum_read(src, enum_declaration);
-	assert(array);
-	/* unref previous array */
-	if (_enum->value)
-		g_array_unref(_enum->value);
-	_enum->value = array;
-	/*
-	 * Arbitrarily choose the first one.
-	 * TODO: use direct underlying declaration read/write intead. Not doing it for
-	 * now to test enum read and write code.
-	 */
-	v = g_array_index(array, GQuark, 0);
-	return fdest->enum_write(dest, enum_declaration, v);
-}
-
 static
 void _enum_declaration_free(struct declaration *declaration)
 {
@@ -391,7 +368,7 @@ void _enum_declaration_free(struct declaration *declaration)
 }
 
 struct declaration_enum *
-	_enum_declaration_new(const char *name, struct declaration_integer *integer_declaration)
+	enum_declaration_new(struct declaration_integer *integer_declaration)
 {
 	struct declaration_enum *enum_declaration;
 
@@ -402,15 +379,13 @@ struct declaration_enum *
 							    enum_val_free,
 							    enum_range_set_free);
 	CDS_INIT_LIST_HEAD(&enum_declaration->table.range_to_quark);
-	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_int_hash,
-							g_int_equal,
+	enum_declaration->table.quark_to_range_set = g_hash_table_new_full(g_direct_hash,
+							g_direct_equal,
 							NULL, enum_range_set_free);
 	declaration_ref(&integer_declaration->p);
 	enum_declaration->integer_declaration = integer_declaration;
 	enum_declaration->p.id = CTF_TYPE_ENUM;
-	enum_declaration->p.name = g_quark_from_string(name);
 	enum_declaration->p.alignment = 1;
-	enum_declaration->p.copy = enum_copy;
 	enum_declaration->p.declaration_free = _enum_declaration_free;
 	enum_declaration->p.definition_new = _enum_definition_new;
 	enum_declaration->p.definition_free = _enum_definition_free;
@@ -421,22 +396,37 @@ struct declaration_enum *
 static
 struct definition *
 	_enum_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_enum *enum_declaration =
 		container_of(declaration, struct declaration_enum, p);
 	struct definition_enum *_enum;
 	struct definition *definition_integer_parent;
+	int ret;
 
 	_enum = g_new(struct definition_enum, 1);
 	declaration_ref(&enum_declaration->p);
 	_enum->p.declaration = declaration;
 	_enum->declaration = enum_declaration;
 	_enum->p.ref = 1;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	_enum->p.index = root_name ? INT_MAX : index;
+	_enum->p.name = field_name;
+	_enum->p.path = new_definition_path(parent_scope, field_name, root_name);
+	_enum->p.scope = new_definition_scope(parent_scope, field_name, root_name);
 	_enum->value = NULL;
+	ret = register_field_definition(field_name, &_enum->p,
+					parent_scope);
+	assert(!ret);
 	definition_integer_parent =
 		enum_declaration->integer_declaration->p.definition_new(&enum_declaration->integer_declaration->p,
-							   parent_scope);
+				_enum->p.scope,
+				g_quark_from_static_string("container"), 0, NULL);
 	_enum->integer = container_of(definition_integer_parent,
 				      struct definition_integer, p);
 	return &_enum->p;
@@ -449,6 +439,7 @@ void _enum_definition_free(struct definition *definition)
 		container_of(definition, struct definition_enum, p);
 
 	definition_unref(&_enum->integer->p);
+	free_definition_scope(_enum->p.scope);
 	declaration_unref(_enum->p.declaration);
 	if (_enum->value)
 		g_array_unref(_enum->value);