X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=types%2Ffloat.c;h=3b61f8faf0a3ec16b0b95b6544cd058cdabd008e;hp=a5917beb14a44a5fc826adcf1ed5d303b2fc0144;hb=12471830622f2f6e67bb14e3fdb112c70a5dbe5e;hpb=d11e9c4975d88591e2324b6b11f426a22995833f diff --git a/types/float.c b/types/float.c index a5917beb..3b61f8fa 100644 --- a/types/float.c +++ b/types/float.c @@ -3,7 +3,9 @@ * * BabelTrace - Float Type Converter * - * Copyright 2010, 2011 - Mathieu Desnoyers + * Copyright 2010-2011 EfficiOS Inc. and Linux Foundation + * + * Author: Mathieu Desnoyers * * Permission is hereby granted, free of charge, to any person obtaining a copy * of this software and associated documentation files (the "Software"), to deal @@ -14,36 +16,47 @@ * * The above copyright notice and this permission notice shall be included in * all copies or substantial portions of the Software. + * + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR + * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, + * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE + * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER + * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, + * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE + * SOFTWARE. */ #include #include +#include +#include static -struct definition *_float_definition_new(struct declaration *declaration, +struct bt_definition *_float_definition_new(struct bt_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); +void _float_definition_free(struct bt_definition *definition); static -void _float_declaration_free(struct declaration *declaration) +void _float_declaration_free(struct bt_declaration *declaration) { struct declaration_float *float_declaration = container_of(declaration, struct declaration_float, p); - declaration_unref(&float_declaration->exp->p); - declaration_unref(&float_declaration->mantissa->p); - declaration_unref(&float_declaration->sign->p); + bt_declaration_unref(&float_declaration->exp->p); + bt_declaration_unref(&float_declaration->mantissa->p); + bt_declaration_unref(&float_declaration->sign->p); g_free(float_declaration); } struct declaration_float * - float_declaration_new(size_t mantissa_len, + bt_float_declaration_new(size_t mantissa_len, size_t exp_len, int byte_order, size_t alignment) { struct declaration_float *float_declaration; - struct declaration *declaration; + struct bt_declaration *declaration; float_declaration = g_new(struct declaration_float, 1); declaration = &float_declaration->p; @@ -55,66 +68,85 @@ struct declaration_float * declaration->ref = 1; float_declaration->byte_order = byte_order; - float_declaration->sign = integer_declaration_new(1, - byte_order, false, 1); - float_declaration->mantissa = integer_declaration_new(mantissa_len - 1, - byte_order, false, 1); - float_declaration->exp = integer_declaration_new(exp_len, - byte_order, true, 1); + float_declaration->sign = bt_integer_declaration_new(1, + byte_order, false, 1, 2, + CTF_STRING_NONE, NULL); + float_declaration->mantissa = bt_integer_declaration_new(mantissa_len - 1, + byte_order, false, 1, 10, + CTF_STRING_NONE, NULL); + float_declaration->exp = bt_integer_declaration_new(exp_len, + byte_order, true, 1, 10, + CTF_STRING_NONE, NULL); return float_declaration; } static -struct definition * - _float_definition_new(struct declaration *declaration, +struct bt_definition * + _float_definition_new(struct bt_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 definition_float *_float; - struct definition *tmp; + struct bt_definition *tmp; _float = g_new(struct definition_float, 1); - declaration_ref(&float_declaration->p); + bt_declaration_ref(&float_declaration->p); _float->p.declaration = declaration; _float->declaration = float_declaration; + _float->p.scope = bt_new_definition_scope(parent_scope, field_name, root_name); + _float->p.path = bt_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, - 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, - 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, - 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, - 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, - 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, - 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->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; + if (parent_scope) { + int ret; + + ret = bt_register_field_definition(field_name, &_float->p, + parent_scope); + assert(!ret); + } return &_float->p; } static -void _float_definition_free(struct definition *definition) +void _float_definition_free(struct bt_definition *definition) { struct definition_float *_float = container_of(definition, struct definition_float, p); - definition_unref(&_float->sign->p); - definition_unref(&_float->exp->p); - definition_unref(&_float->mantissa->p); - declaration_unref(_float->p.declaration); + bt_definition_unref(&_float->sign->p); + bt_definition_unref(&_float->exp->p); + bt_definition_unref(&_float->mantissa->p); + bt_free_definition_scope(_float->p.scope); + bt_declaration_unref(_float->p.declaration); g_free(_float); }