Add array

[babeltrace.git] / types / float.c

diff --git a/types/float.c b/types/float.c
index e42daa162170c39d388caba940178da3e4ea14db..56ca402c2b4a9a9f4f84f80c26a4a0fa18b8848a 100644 (file)
--- a/types/float.c
+++ b/types/float.c
@@ -21,26 +21,28 @@
 #include <babeltrace/compiler.h>
 #include <babeltrace/types.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 *dest, const struct format *fdest, 
+               struct stream_pos *src, 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(dest, src, float_class);
        } else {
                double v;
 
-               v = fsrc->double_read(src, fsrc);
-               return fdest->double_write(dest, fdest, v);
+               v = fsrc->double_read(src, float_class);
+               fdest->double_write(dest, 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);
 }
 
@@ -57,22 +59,46 @@ struct type_class_float *float_type_new(const char *name,
                                        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);
-       float_class->p.name = g_quark_from_string(name);
-       float_class->p.alignment = alignment;
-       float_class->p.copy = float_copy;
-       float_class->p.free = _float_type_free;
-       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;
        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;
-               }
+               if (ret)
+                       goto error_register;
        }
        return 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;
 }