X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=3e49a4b1fbc7c2c995cb7adc490de0fe49d61d6b;hp=2306d94f1b17cecd48df03b89343efe507fe8256;hb=91f361c1757256c11988ab16376419a72592e1a9;hpb=164078da31b3612e3618e8e8046a3866cb22f80e

diff --git a/types/float.c b/types/float.c
index 2306d94f..3e49a4b1 100644
--- a/types/float.c
+++ b/types/float.c
@@ -3,7 +3,9 @@
  *
  * BabelTrace - Float Type Converter
  *
- * Copyright 2010, 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
@@ -18,12 +20,14 @@
 
 #include <babeltrace/compiler.h>
 #include <babeltrace/format.h>
-#include <endian.h>
+#include <babeltrace/types.h>
+#include <babeltrace/endian.h>
 
 static
 struct definition *_float_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 _float_definition_free(struct definition *definition);
 
@@ -57,11 +61,14 @@ struct declaration_float *
 	float_declaration->byte_order = byte_order;
 
 	float_declaration->sign = integer_declaration_new(1,
-					    byte_order, false, 1, 2);
+						byte_order, false, 1, 2,
+						CTF_STRING_NONE, NULL);
 	float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
-						byte_order, false, 1, 10);
+						byte_order, false, 1, 10,
+						CTF_STRING_NONE, NULL);
 	float_declaration->exp = integer_declaration_new(exp_len,
-					   byte_order, true, 1, 10);
+						byte_order, true, 1, 10,
+						CTF_STRING_NONE, NULL);
 	return float_declaration;
 }
 
@@ -69,43 +76,55 @@ static
 struct definition *
 	_float_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_float *float_declaration =
 		container_of(declaration, struct declaration_float, p);
 	struct definition_float *_float;
 	struct definition *tmp;
+	int ret;
 
 	_float = g_new(struct definition_float, 1);
 	declaration_ref(&float_declaration->p);
 	_float->p.declaration = declaration;
 	_float->declaration = float_declaration;
+	_float->p.scope = new_definition_scope(parent_scope, field_name, root_name);
+	_float->p.path = new_definition_path(parent_scope, field_name, root_name);
 	if (float_declaration->byte_order == LITTLE_ENDIAN) {
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			parent_scope, g_quark_from_static_string("mantissa"), 0);
+			_float->p.scope, g_quark_from_static_string("mantissa"), 0, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			parent_scope, g_quark_from_static_string("exp"), 1);
+			_float->p.scope, g_quark_from_static_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			parent_scope, g_quark_from_static_string("sign"), 2);
+			_float->p.scope, g_quark_from_static_string("sign"), 2, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 	} else {
 		tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-			parent_scope, g_quark_from_static_string("sign"), 0);
+			_float->p.scope, g_quark_from_static_string("sign"), 0, NULL);
 		_float->sign = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-			parent_scope, g_quark_from_static_string("exp"), 1);
+			_float->p.scope, g_quark_from_static_string("exp"), 1, NULL);
 		_float->exp = container_of(tmp, struct definition_integer, p);
 		tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-			parent_scope, g_quark_from_static_string("mantissa"), 2);
+			_float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL);
 		_float->mantissa = container_of(tmp, struct definition_integer, p);
 	}
 	_float->p.ref = 1;
-	_float->p.index = index;
+	/*
+	 * Use INT_MAX order to ensure that all fields of the parent
+	 * scope are seen as being prior to this scope.
+	 */
+	_float->p.index = root_name ? INT_MAX : index;
 	_float->p.name = field_name;
-	_float->p.path = new_definition_path(parent_scope, field_name);
 	_float->value = 0.0;
+	if (parent_scope) {
+		ret = register_field_definition(field_name, &_float->p,
+						parent_scope);
+		assert(!ret);
+	}
 	return &_float->p;
 }
 
@@ -118,6 +137,7 @@ void _float_definition_free(struct definition *definition)
 	definition_unref(&_float->sign->p);
 	definition_unref(&_float->exp->p);
 	definition_unref(&_float->mantissa->p);
+	free_definition_scope(_float->p.scope);
 	declaration_unref(_float->p.declaration);
 	g_free(_float);
 }