projects
/
babeltrace.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 1.0.0
[babeltrace.git]
/
types
/
float.c
diff --git
a/types/float.c
b/types/float.c
index 1efd5ed3624ccf4be0c9469d1a88aabd55d44e5a..b2ef65bc3ee21510deafcb3d63516ab0b2780e91 100644
(file)
--- a/
types/float.c
+++ b/
types/float.c
@@
-3,7
+3,9
@@
*
* BabelTrace - Float Type Converter
*
*
* 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
*
* 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,12
+20,14
@@
#include <babeltrace/compiler.h>
#include <babeltrace/format.h>
#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,
struct definition_scope *parent_scope,
static
struct definition *_float_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index);
+ GQuark field_name, int index,
+ const char *root_name);
static
void _float_definition_free(struct definition *definition);
static
void _float_definition_free(struct definition *definition);
@@
-57,11
+61,14
@@
struct declaration_float *
float_declaration->byte_order = byte_order;
float_declaration->sign = integer_declaration_new(1,
float_declaration->byte_order = byte_order;
float_declaration->sign = integer_declaration_new(1,
- byte_order, false, 1);
+ byte_order, false, 1, 2,
+ CTF_STRING_NONE, NULL);
float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
float_declaration->mantissa = integer_declaration_new(mantissa_len - 1,
- byte_order, false, 1);
+ byte_order, false, 1, 10,
+ CTF_STRING_NONE, NULL);
float_declaration->exp = integer_declaration_new(exp_len,
float_declaration->exp = integer_declaration_new(exp_len,
- byte_order, true, 1);
+ byte_order, true, 1, 10,
+ CTF_STRING_NONE, NULL);
return float_declaration;
}
return float_declaration;
}
@@
-69,7
+76,8
@@
static
struct definition *
_float_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
struct definition *
_float_definition_new(struct declaration *declaration,
struct definition_scope *parent_scope,
- GQuark field_name, int index)
+ GQuark field_name, int index,
+ const char *root_name)
{
struct declaration_float *float_declaration =
container_of(declaration, struct declaration_float, p);
{
struct declaration_float *float_declaration =
container_of(declaration, struct declaration_float, p);
@@
-80,30
+88,44
@@
struct definition *
declaration_ref(&float_declaration->p);
_float->p.declaration = declaration;
_float->declaration = float_declaration;
declaration_ref(&float_declaration->p);
_float->p.declaration = declaration;
_float->declaration = float_declaration;
+ _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,
if (float_declaration->byte_order == LITTLE_ENDIAN) {
tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-
parent_scope, g_quark_from_static_string("mantissa"), 0
);
+
_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->mantissa = container_of(tmp, struct definition_integer, p);
tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-
parent_scope, g_quark_from_static_string("exp"), 1
);
+
_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->exp = container_of(tmp, struct definition_integer, p);
tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-
parent_scope, g_quark_from_static_string("sign"), 2
);
+
_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->sign = container_of(tmp, struct definition_integer, p);
} else {
tmp = float_declaration->sign->p.definition_new(&float_declaration->sign->p,
-
parent_scope, g_quark_from_static_string("sign"), 0
);
+
_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->sign = container_of(tmp, struct definition_integer, p);
tmp = float_declaration->exp->p.definition_new(&float_declaration->exp->p,
-
parent_scope, g_quark_from_static_string("exp"), 1
);
+
_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->exp = container_of(tmp, struct definition_integer, p);
tmp = float_declaration->mantissa->p.definition_new(&float_declaration->mantissa->p,
-
parent_scope, g_quark_from_static_string("mantissa"), 2
);
+
_float->p.scope, g_quark_from_static_string("mantissa"), 2, NULL
);
_float->mantissa = container_of(tmp, struct definition_integer, p);
}
_float->p.ref = 1;
_float->mantissa = container_of(tmp, struct definition_integer, p);
}
_float->p.ref = 1;
- _float->p.index = index;
+ /*
+ * Use INT_MAX order to ensure that all fields of the parent
+ * scope are seen as being prior to this scope.
+ */
+ _float->p.index = root_name ? INT_MAX : index;
+ _float->p.name = field_name;
_float->value = 0.0;
_float->value = 0.0;
+ if (parent_scope) {
+ int ret;
+
+ ret = register_field_definition(field_name, &_float->p,
+ parent_scope);
+ assert(!ret);
+ }
return &_float->p;
}
return &_float->p;
}
@@
-116,6
+138,7
@@
void _float_definition_free(struct definition *definition)
definition_unref(&_float->sign->p);
definition_unref(&_float->exp->p);
definition_unref(&_float->mantissa->p);
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);
}
declaration_unref(_float->p.declaration);
g_free(_float);
}
This page took
0.045423 seconds
and
4
git commands to generate.