X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=c78cf584feb4f07f9100ed5f8902a046f1027e01;hp=b3e0dc1cfc3808c27ebf16ee8be6e731a91a39f0;hb=c054553dac076f91196b372fa19efaf2adc4e4f9;hpb=ccd7e1c86f36342b0b06651cc52df86bb663c271

diff --git a/types/float.c b/types/float.c
index b3e0dc1c..c78cf584 100644
--- a/types/float.c
+++ b/types/float.c
@@ -3,7 +3,7 @@
  *
  * BabelTrace - Float Type Converter
  *
- * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * Copyright 2010, 2011 - 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
@@ -17,57 +17,62 @@
  */
 
 #include <babeltrace/compiler.h>
-#include <babeltrace/types.h>
+#include <babeltrace/format.h>
 
-void float_copy(struct stream_pos *dest, const struct format *fdest, 
-		struct stream_pos *src, const struct format *fsrc,
-		const struct type_class *type_class)
+static
+struct type_float *_float_type_new(struct type_class *type_class,
+				   struct declaration_scope *parent_scope);
+static
+void _float_type_free(struct type *type);
+
+void float_copy(struct stream_pos *destp,
+		const struct format *fdest,
+		struct stream_pos *srcp,
+		const struct format *fsrc,
+		struct type *type)
 {
-	struct type_class_float *float_class =
-		container_of(type_class, struct type_class_float, p);
+	struct type_float *_float = container_of(type, struct type_float, p);
+	struct type_class_float *float_class = _float->_class;
 
 	if (fsrc->float_copy == fdest->float_copy) {
-		fsrc->float_copy(dest, src, float_class);
+		fsrc->float_copy(destp, srcp, float_class);
 	} else {
 		double v;
 
-		v = fsrc->double_read(src, float_class);
-		fdest->double_write(dest, float_class, v);
+		v = fsrc->double_read(srcp, float_class);
+		fdest->double_write(destp, float_class, v);
 	}
 }
 
-void float_type_free(struct type_class_float *float_class)
-{
-	integer_type_free(float_class->exp);
-	integer_type_free(float_class->mantissa);
-	integer_type_free(float_class->sign);
-	g_free(float_class);
-}
-
-static void _float_type_free(struct type_class *type_class)
+static
+void _float_type_class_free(struct type_class *type_class)
 {
 	struct type_class_float *float_class =
 		container_of(type_class, struct type_class_float, p);
-	float_type_free(float_class);
+
+	type_class_unref(&float_class->exp->p);
+	type_class_unref(&float_class->mantissa->p);
+	type_class_unref(&float_class->sign->p);
+	g_free(float_class);
 }
 
-struct type_class_float *float_type_new(const char *name,
-					size_t mantissa_len,
-					size_t exp_len, int byte_order,
-					size_t alignment)
+struct type_class_float *
+float_type_class_new(const char *name, size_t mantissa_len,
+		     size_t exp_len, int byte_order, size_t alignment)
 {
 	struct type_class_float *float_class;
-	struct type_class_integer *int_class;
 	struct type_class *type_class;
 	int ret;
 
 	float_class = g_new(struct type_class_float, 1);
 	type_class = &float_class->p;
-
 	type_class->name = g_quark_from_string(name);
 	type_class->alignment = alignment;
 	type_class->copy = float_copy;
-	type_class->free = _float_type_free;
+	type_class->class_free = _float_type_class_free;
+	type_class->type_new = _float_type_new;
+	type_class->type_free = _float_type_free;
+	type_class->ref = 1;
 	float_class->byte_order = byte_order;
 
 	float_class->sign = integer_type_new(NULL, 1,
@@ -84,19 +89,44 @@ struct type_class_float *float_type_new(const char *name,
 		goto error_exp;
 
 	if (float_class->p.name) {
-		ret = ctf_register_type(&float_class->p);
+		ret = register_type(&float_class->p);
 		if (ret)
 			goto error_register;
 	}
 	return float_class;
 
 error_register:
-	integer_type_free(float_class->exp);
+	type_class_unref(&float_class->exp->p);
 error_exp:
-	integer_type_free(float_class->mantissa);
+	type_class_unref(&float_class->mantissa->p);
 error_mantissa:
-	integer_type_free(float_class->sign);
+	type_class_unref(&float_class->sign->p);
 error_sign:
 	g_free(float_class);
 	return NULL;
 }
+
+static
+struct type_float *_float_type_new(struct type_class *type_class,
+				   struct declaration_scope *parent_scope)
+{
+	struct type_class_float *float_class =
+		container_of(type_class, struct type_class_float, p);
+	struct type_float *_float;
+
+	_float = g_new(struct type_float, 1);
+	type_class_ref(&_float_class->p);
+	_float->p._class = _float_class;
+	_float->p.ref = 1;
+	_float->value = 0.0;
+	return &_float->p;
+}
+
+static
+void _float_type_free(struct type *type)
+{
+	struct type_float *_float = container_of(type, struct type_float, p);
+
+	type_class_unref(_float->p._class);
+	g_free(_float);
+}