X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=2ce6b5929d50d5f5609ef1ee8c96787208acd9df;hp=ac1525595bc99c82a95f9cd2bc62321c6480be54;hb=be85c1c7633af07e35db7b415d6ee8447c30e80a;hpb=0a46062b3916eda6f871b5d80c4b97dcb3804d37

diff --git a/types/float.c b/types/float.c
index ac152559..2ce6b592 100644
--- a/types/float.c
+++ b/types/float.c
@@ -1,72 +1,104 @@
 /*
- * BabelTrace - Float Type Converter
+ * float.c
  *
- * Copyright (c) 2010 Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
+ * BabelTrace - Float Type Converter
  *
- * This library is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either
- * version 2.1 of the License, or (at your option) any later version.
+ * Copyright 2010 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This library is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
  *
- * You should have received a copy of the GNU Lesser General Public
- * License along with this library; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  */
 
 #include <babeltrace/compiler.h>
+#include <babeltrace/format.h>
 
-size_t float_copy(unsigned char *dest, const struct format *fdest, 
-		  const unsigned char *src, const struct format *fsrc,
-		  const struct type_class *type_class)
+void float_copy(struct stream_pos *destp,
+		const struct format *fdest,
+		struct stream_pos *srcp,
+		const struct format *fsrc,
+		const struct type_class *type_class)
 {
 	struct type_class_float *float_class =
 		container_of(type_class, struct type_class_float, p);
 
 	if (fsrc->float_copy == fdest->float_copy) {
-		fsrc->float_copy(dest, float_class, src, float_class);
-		return float_class->mantissa_len + float_class->exp_len;
+		fsrc->float_copy(destp, srcp, float_class);
 	} else {
 		double v;
 
-		v = fsrc->double_read(src, fsrc);
-		return fdest->double_write(dest, fdest, 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)
+{
+	struct type_class_float *float_class =
+		container_of(type_class, struct type_class_float, p);
+	float_type_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_class;
+	struct type_class *type_class;
 	int ret;
 
-	/*
-	 * Freed when type is unregistered.
-	 */
 	float_class = g_new(struct type_class_float, 1);
-	float_class->p.name = g_quark_from_string(name);
-	float_class->p.alignment = alignment;
-	float_class->mantissa_len = mantissa_len;
-	float_class->exp_len = exp_len;
+	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->ref = 1;
 	float_class->byte_order = byte_order;
+
+	float_class->sign = integer_type_new(NULL, 1,
+					     byte_order, false, 1);
+	if (!float_class->mantissa)
+		goto error_sign;
+	float_class->mantissa = integer_type_new(NULL, mantissa_len - 1,
+						 byte_order, false, 1);
+	if (!float_class->mantissa)
+		goto error_mantissa;
+	float_class->exp = integer_type_new(NULL, exp_len,
+					    byte_order, true, 1);
+	if (!float_class->exp)
+		goto error_exp;
+
 	if (float_class->p.name) {
-		ret = ctf_register_type(&float_class->p);
-		if (ret) {
-			g_free(float_class);
-			return NULL;
-		}
+		ret = register_type(&float_class->p);
+		if (ret)
+			goto error_register;
 	}
 	return float_class;
-}
 
-void float_type_free(struct type_class_float *float_class)
-{
-	if (!float_class->name)
-		g_free(float_class);
+error_register:
+	integer_type_free(float_class->exp);
+error_exp:
+	integer_type_free(float_class->mantissa);
+error_mantissa:
+	integer_type_free(float_class->sign);
+error_sign:
+	g_free(float_class);
+	return NULL;
 }