Fix: assign the current clock for mmap traces

[babeltrace.git] / types / float.c

diff --git a/types/float.c b/types/float.c
index dab8d0da734536b29e953840b3761453cbd93b6b..3e49a4b1fbc7c2c995cb7adc490de0fe49d61d6b 100644 (file)
--- 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,7 +20,8 @@
 
 #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,
@@ -59,13 +62,13 @@ struct declaration_float *
 
        float_declaration->sign = integer_declaration_new(1,
                                                byte_order, false, 1, 2,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
                                                byte_order, false, 1, 10,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        float_declaration->exp = integer_declaration_new(exp_len,
                                                byte_order, true, 1, 10,
-                                               CTF_STRING_NONE);
+                                               CTF_STRING_NONE, NULL);
        return float_declaration;
 }
 
@@ -86,27 +89,27 @@ struct definition *
        declaration_ref(&float_declaration->p);
        _float->p.declaration = declaration;
        _float->declaration = float_declaration;
-       _float->scope = new_definition_scope(parent_scope, field_name, root_name);
+       _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,
-                       _float->scope, g_quark_from_static_string("mantissa"), 0, NULL);
+                       _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,
-                       _float->scope, g_quark_from_static_string("exp"), 1, NULL);
+                       _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,
-                       _float->scope, g_quark_from_static_string("sign"), 2, NULL);
+                       _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,
-                       _float->scope, g_quark_from_static_string("sign"), 0, NULL);
+                       _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,
-                       _float->scope, g_quark_from_static_string("exp"), 1, NULL);
+                       _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,
-                       _float->scope, g_quark_from_static_string("mantissa"), 2, NULL);
+                       _float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL);
                _float->mantissa = container_of(tmp, struct definition_integer, p);
        }
        _float->p.ref = 1;
@@ -117,9 +120,11 @@ struct definition *
        _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;
 }
 
@@ -132,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);
 }