Fix float support

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/formats/ctf-text/types/float.c b/formats/ctf-text/types/float.c
index 2b0dccecc9a3a3b68948a7e04c3c8d4eb654a2a5..77651124d000e2bb41942efc7b3ec0385802b5c6 100644 (file)
--- a/formats/ctf-text/types/float.c
+++ b/formats/ctf-text/types/float.c
@@ -42,6 +42,6 @@ int ctf_text_float_write(struct stream_pos *ppos, struct definition *definition)
                fprintf(pos->fp, "%s = ",
                        rem_(g_quark_to_string(definition->name)));
 
                fprintf(pos->fp, "%s = ",
                        rem_(g_quark_to_string(definition->name)));
 

-       fprintf(pos->fp, "%Lg\n", float_definition->value);
+       fprintf(pos->fp, "%g", float_definition->value);

        return 0;
 }
        return 0;
 }

diff --git a/formats/ctf/types/float.c b/formats/ctf/types/float.c
index 7f5e40661e5858c0a51cecf4bb08821724418d6f..0a9535923d09de5346773a46968e1f92235b1c1b 100644 (file)
--- a/formats/ctf/types/float.c
+++ b/formats/ctf/types/float.c
@@ -28,8 +28,8 @@
 
 /*
  * This library is limited to binary representation of floating point values.
 
 /*
  * This library is limited to binary representation of floating point values.

- * Sign-extension of the exponents is assumed to keep the NaN, +inf, -inf
- * values, but this should be double-checked (TODO).
+ * We use hardware support for conversion between 32 and 64-bit floating
+ * point values.

  */
 
 /*
  */
 
 /*


@@ -49,7 +49,8 @@
 #endif
 
 union doubleIEEE754 {
 #endif
 
 union doubleIEEE754 {

-       double v;
+       double vd;
+       float vf;

 #ifdef HAS_TYPE_PRUNING
        unsigned long bits[(sizeof(double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)];
 #else
 #ifdef HAS_TYPE_PRUNING
        unsigned long bits[(sizeof(double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)];
 #else


@@ -57,16 +58,8 @@ union doubleIEEE754 {
 #endif
 };
 
 #endif
 };
 

-union ldoubleIEEE754 {
-       long double v;
-#ifdef HAS_TYPE_PRUNING
-       unsigned long bits[(sizeof(long double) + sizeof(unsigned long) - 1) / sizeof(unsigned long)];
-#else
-       unsigned char bits[sizeof(long double)];
-#endif
-};
-
-static struct declaration_float *static_ldouble_declaration;
+static struct declaration_float *static_float_declaration,
+               *static_double_declaration;

 
 struct pos_len {
        size_t sign_start, exp_start, mantissa_start, len;
 
 struct pos_len {
        size_t sign_start, exp_start, mantissa_start, len;


@@ -79,6 +72,13 @@ int _ctf_float_copy(struct stream_pos *destp,
 {
        int ret;
 
 {
        int ret;
 

+       /* We only support copy of same-size floats for now */
+       assert(src_definition->declaration->sign->len ==
+               dest_definition->declaration->sign->len);
+       assert(src_definition->declaration->exp->len ==
+               dest_definition->declaration->exp->len);
+       assert(src_definition->declaration->mantissa->len ==
+               dest_definition->declaration->mantissa->len);

        /* Read */
        if (src_definition->declaration->byte_order == LITTLE_ENDIAN) {
                ret = ctf_integer_read(srcp, &src_definition->mantissa->p);
        /* Read */
        if (src_definition->declaration->byte_order == LITTLE_ENDIAN) {
                ret = ctf_integer_read(srcp, &src_definition->mantissa->p);


@@ -141,21 +141,42 @@ int ctf_float_read(struct stream_pos *ppos, struct definition *definition)
        const struct declaration_float *float_declaration =
                float_definition->declaration;
        struct ctf_stream_pos *pos = ctf_pos(ppos);
        const struct declaration_float *float_declaration =
                float_definition->declaration;
        struct ctf_stream_pos *pos = ctf_pos(ppos);

-       union ldoubleIEEE754 u;
-       struct definition *tmpdef =
-               static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p,
-                               NULL, 0, 0, NULL);
-       struct definition_float *tmpfloat =
-               container_of(tmpdef, struct definition_float, p);
+       union doubleIEEE754 u;
+       struct definition *tmpdef;
+       struct definition_float *tmpfloat;

        struct ctf_stream_pos destp;
        int ret;
 
        struct ctf_stream_pos destp;
        int ret;
 

+       switch (float_declaration->mantissa->len + 1) {
+       case FLT_MANT_DIG:
+               tmpdef = static_float_declaration->p.definition_new(
+                               &static_float_declaration->p,
+                               NULL, 0, 0, "__tmpfloat");
+               break;
+       case DBL_MANT_DIG:
+               tmpdef = static_double_declaration->p.definition_new(
+                               &static_double_declaration->p,
+                               NULL, 0, 0, "__tmpfloat");
+               break;
+       default:
+               return -EINVAL;
+       }
+       tmpfloat = container_of(tmpdef, struct definition_float, p);

        ctf_init_pos(&destp, -1, O_RDWR);
        destp.base = (char *) u.bits;
        ctf_init_pos(&destp, -1, O_RDWR);
        destp.base = (char *) u.bits;

-
+       destp.packet_size = sizeof(u) * CHAR_BIT;

        ctf_align_pos(pos, float_declaration->p.alignment);
        ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);
        ctf_align_pos(pos, float_declaration->p.alignment);
        ret = _ctf_float_copy(&destp.parent, tmpfloat, ppos, float_definition);

-       float_definition->value = u.v;
+       switch (float_declaration->mantissa->len + 1) {
+       case FLT_MANT_DIG:
+               float_definition->value = u.vf;
+               break;
+       case DBL_MANT_DIG:
+               float_definition->value = u.vd;
+               break;
+       default:
+               return -EINVAL;
+       }

        definition_unref(tmpdef);
        return ret;
 }
        definition_unref(tmpdef);
        return ret;
 }


@@ -167,19 +188,40 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
        const struct declaration_float *float_declaration =
                float_definition->declaration;
        struct ctf_stream_pos *pos = ctf_pos(ppos);
        const struct declaration_float *float_declaration =
                float_definition->declaration;
        struct ctf_stream_pos *pos = ctf_pos(ppos);

-       union ldoubleIEEE754 u;
-       struct definition *tmpdef =
-               static_ldouble_declaration->p.definition_new(&static_ldouble_declaration->p,
-                               NULL, 0, 0, NULL);
-       struct definition_float *tmpfloat =
-               container_of(tmpdef, struct definition_float, p);
+       union doubleIEEE754 u;
+       struct definition *tmpdef;
+       struct definition_float *tmpfloat;

        struct ctf_stream_pos srcp;
        int ret;
 
        struct ctf_stream_pos srcp;
        int ret;
 

+       switch (float_declaration->mantissa->len + 1) {
+       case FLT_MANT_DIG:
+               tmpdef = static_float_declaration->p.definition_new(
+                               &static_float_declaration->p,
+                               NULL, 0, 0, "__tmpfloat");
+               break;
+       case DBL_MANT_DIG:
+               tmpdef = static_double_declaration->p.definition_new(
+                               &static_double_declaration->p,
+                               NULL, 0, 0, "__tmpfloat");
+               break;
+       default:
+               return -EINVAL;
+       }
+       tmpfloat = container_of(tmpdef, struct definition_float, p);

        ctf_init_pos(&srcp, -1, O_RDONLY);
        srcp.base = (char *) u.bits;
        ctf_init_pos(&srcp, -1, O_RDONLY);
        srcp.base = (char *) u.bits;

-
-       u.v = float_definition->value;
+       srcp.packet_size = sizeof(u) * CHAR_BIT;
+       switch (float_declaration->mantissa->len + 1) {
+       case FLT_MANT_DIG:
+               u.vf = float_definition->value;
+               break;
+       case DBL_MANT_DIG:
+               u.vd = float_definition->value;
+               break;
+       default:
+               return -EINVAL;
+       }

        ctf_align_pos(pos, float_declaration->p.alignment);
        ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
        definition_unref(tmpdef);
        ctf_align_pos(pos, float_declaration->p.alignment);
        ret = _ctf_float_copy(ppos, float_definition, &srcp.parent, tmpfloat);
        definition_unref(tmpdef);


@@ -188,14 +230,20 @@ int ctf_float_write(struct stream_pos *ppos, struct definition *definition)
 
 void __attribute__((constructor)) ctf_float_init(void)
 {
 
 void __attribute__((constructor)) ctf_float_init(void)
 {

-       static_ldouble_declaration =
-               float_declaration_new(LDBL_MANT_DIG,
-                               sizeof(long double) * CHAR_BIT - LDBL_MANT_DIG,
+       static_float_declaration =
+               float_declaration_new(FLT_MANT_DIG,
+                               sizeof(float) * CHAR_BIT - FLT_MANT_DIG,
+                               BYTE_ORDER,
+                               __alignof__(float));
+       static_double_declaration =
+               float_declaration_new(DBL_MANT_DIG,
+                               sizeof(double) * CHAR_BIT - DBL_MANT_DIG,

                                BYTE_ORDER,
                                BYTE_ORDER,

-                               __alignof__(long double));
+                               __alignof__(double));

 }
 
 void __attribute__((destructor)) ctf_float_fini(void)
 {
 }
 
 void __attribute__((destructor)) ctf_float_fini(void)
 {

-       declaration_unref(&static_ldouble_declaration->p);
+       declaration_unref(&static_float_declaration->p);
+       declaration_unref(&static_double_declaration->p);

 }
 }

diff --git a/include/babeltrace/types.h b/include/babeltrace/types.h
index a9fb5fe3ef6e30acd2b63d5b046128291ba1e064..15b82bd74e86a47d7c3e586c434caa34053fbc35 100644 (file)
--- a/include/babeltrace/types.h
+++ b/include/babeltrace/types.h
@@ -179,7 +179,7 @@ struct definition_float {
        struct definition_integer *mantissa;
        struct definition_integer *exp;
        /* Last values read */
        struct definition_integer *mantissa;
        struct definition_integer *exp;
        /* Last values read */

-       long double value;
+       double value;

 };
 
 /*
 };
 
 /*

diff --git a/types/float.c b/types/float.c
index cc6c957aeebe09ebc6124cc4cdf8db985f558893..dc97af48f1304d99003446b404bf6785169b1640 100644 (file)
--- a/types/float.c
+++ b/types/float.c
@@ -119,9 +119,11 @@ struct definition *
        _float->p.index = root_name ? INT_MAX : index;
        _float->p.name = field_name;
        _float->value = 0.0;
        _float->p.index = root_name ? INT_MAX : index;
        _float->p.name = field_name;
        _float->value = 0.0;

-       ret = register_field_definition(field_name, &_float->p,
-                                       parent_scope);
-       assert(!ret);
+       if (parent_scope) {
+               ret = register_field_definition(field_name, &_float->p,
+                                               parent_scope);
+               assert(!ret);
+       }

        return &_float->p;
 }
 
        return &_float->p;
 }