X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fctf-writer%2Fvalues.c;h=3eeed2d3664e1c8259162a1d0434ab7ae82a2f15;hb=827e42e017fc5f525aa39a3851bf2e7e50e887aa;hp=643ba0bbdcd5680eb9056b798194bdb6c9f8fe0d;hpb=ef267d12284b855bc52ee429a5dc12da1d1e3b95;p=babeltrace.git diff --git a/src/ctf-writer/values.c b/src/ctf-writer/values.c index 643ba0bb..3eeed2d3 100644 --- a/src/ctf-writer/values.c +++ b/src/ctf-writer/values.c @@ -1,24 +1,8 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright (c) 2015 EfficiOS Inc. and Linux Foundation * Copyright (c) 2015 Philippe Proulx - * - * Permission is hereby granted, free of charge, to any person obtaining a copy - * of this software and associated documentation files (the "Software"), to deal - * in the Software without restriction, including without limitation the rights - * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell - * copies of the Software, and to permit persons to whom the Software is - * furnished to do so, subject to the following conditions: - * - * 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. */ #define BT_LOG_TAG "CTF-WRITER/VALUES" @@ -28,7 +12,7 @@ #include #include -#include +#include #include #include "common/assert.h" @@ -63,7 +47,7 @@ struct bt_ctf_value { struct bt_ctf_object base; enum bt_ctf_value_type type; - bt_bool frozen; + bt_ctf_bool frozen; }; static @@ -83,7 +67,7 @@ struct bt_ctf_value bt_ctf_value_null_instance = { .parent = NULL, }, .type = BT_CTF_VALUE_TYPE_NULL, - .frozen = BT_TRUE, + .frozen = BT_CTF_TRUE, }; struct bt_ctf_value *const bt_ctf_value_null = &bt_ctf_value_null_instance; @@ -92,7 +76,7 @@ struct bt_ctf_private_value *const bt_ctf_private_value_null = struct bt_ctf_value_bool { struct bt_ctf_value base; - bt_bool value; + bt_ctf_bool value; }; struct bt_ctf_value_integer { @@ -221,7 +205,7 @@ struct bt_ctf_private_value *bt_ctf_value_array_copy(const struct bt_ctf_value * bt_ctf_value_array_borrow_element_by_index( array_obj, i); - BT_ASSERT(element_obj); + BT_ASSERT_DBG(element_obj); BT_LOGD("Copying array value's element: element-addr=%p, " "index=%d", element_obj, i); ret = bt_ctf_value_copy(&element_obj_copy, element_obj); @@ -233,7 +217,7 @@ struct bt_ctf_private_value *bt_ctf_value_array_copy(const struct bt_ctf_value * goto end; } - BT_ASSERT(element_obj_copy); + BT_ASSERT_DBG(element_obj_copy); ret = bt_ctf_private_value_array_append_element(copy_obj, (void *) element_obj_copy); BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy); @@ -274,7 +258,7 @@ struct bt_ctf_private_value *bt_ctf_value_map_copy(const struct bt_ctf_value *ma while (g_hash_table_iter_next(&iter, &key, &element_obj)) { const char *key_str = g_quark_to_string(GPOINTER_TO_UINT(key)); - BT_ASSERT(key_str); + BT_ASSERT_DBG(key_str); BT_LOGD("Copying map value's element: element-addr=%p, " "key=\"%s\"", element_obj, key_str); ret = bt_ctf_value_copy(&element_obj_copy, element_obj); @@ -286,7 +270,7 @@ struct bt_ctf_private_value *bt_ctf_value_map_copy(const struct bt_ctf_value *ma goto end; } - BT_ASSERT(element_obj_copy); + BT_ASSERT_DBG(element_obj_copy); ret = bt_ctf_private_value_map_insert_entry(copy_obj, key_str, (void *) element_obj_copy); BT_CTF_OBJECT_PUT_REF_AND_RESET(element_obj_copy); @@ -316,19 +300,19 @@ struct bt_ctf_private_value *(* const copy_funcs[])(const struct bt_ctf_value *) }; static -bt_bool bt_ctf_value_null_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_null_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { /* - * Always BT_TRUE since bt_ctf_value_compare() already checks if both + * Always BT_CTF_TRUE since bt_ctf_value_compare() already checks if both * object_a and object_b have the same type, and in the case of * null value objects, they're always the same if it is so. */ - return BT_TRUE; + return BT_CTF_TRUE; } static -bt_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { if (BT_CTF_VALUE_TO_BOOL(object_a)->value != @@ -337,14 +321,14 @@ bt_bool bt_ctf_value_bool_compare(const struct bt_ctf_value *object_a, "bool-a-val=%d, bool-b-val=%d", BT_CTF_VALUE_TO_BOOL(object_a)->value, BT_CTF_VALUE_TO_BOOL(object_b)->value); - return BT_FALSE; + return BT_CTF_FALSE; } - return BT_TRUE; + return BT_CTF_TRUE; } static -bt_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { if (BT_CTF_VALUE_TO_INTEGER(object_a)->value != @@ -353,14 +337,14 @@ bt_bool bt_ctf_value_integer_compare(const struct bt_ctf_value *object_a, "int-a-val=%" PRId64 ", int-b-val=%" PRId64, BT_CTF_VALUE_TO_INTEGER(object_a)->value, BT_CTF_VALUE_TO_INTEGER(object_b)->value); - return BT_FALSE; + return BT_CTF_FALSE; } - return BT_TRUE; + return BT_CTF_TRUE; } static -bt_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { if (BT_CTF_VALUE_TO_REAL(object_a)->value != @@ -369,14 +353,14 @@ bt_bool bt_ctf_value_real_compare(const struct bt_ctf_value *object_a, "real-a-val=%f, real-b-val=%f", BT_CTF_VALUE_TO_REAL(object_a)->value, BT_CTF_VALUE_TO_REAL(object_b)->value); - return BT_FALSE; + return BT_CTF_FALSE; } - return BT_TRUE; + return BT_CTF_TRUE; } static -bt_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { if (strcmp(BT_CTF_VALUE_TO_STRING(object_a)->gstr->str, @@ -385,30 +369,30 @@ bt_bool bt_ctf_value_string_compare(const struct bt_ctf_value *object_a, "string-a-val=\"%s\", string-b-val=\"%s\"", BT_CTF_VALUE_TO_STRING(object_a)->gstr->str, BT_CTF_VALUE_TO_STRING(object_b)->gstr->str); - return BT_FALSE; + return BT_CTF_FALSE; } - return BT_TRUE; + return BT_CTF_TRUE; } static -bt_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { int i; - bt_bool ret = BT_TRUE; + bt_ctf_bool ret = BT_CTF_TRUE; const struct bt_ctf_value_array *array_obj_a = BT_CTF_VALUE_TO_ARRAY(object_a); - if (bt_ctf_value_array_get_size(object_a) != - bt_ctf_value_array_get_size(object_b)) { + if (bt_ctf_value_array_get_length(object_a) != + bt_ctf_value_array_get_length(object_b)) { BT_LOGT("Array values are different: size mismatch " "value-a-addr=%p, value-b-addr=%p, " "value-a-size=%" PRId64 ", value-b-size=%" PRId64, object_a, object_b, - bt_ctf_value_array_get_size(object_a), - bt_ctf_value_array_get_size(object_b)); - ret = BT_FALSE; + bt_ctf_value_array_get_length(object_a), + bt_ctf_value_array_get_length(object_b)); + ret = BT_CTF_FALSE; goto end; } @@ -425,7 +409,7 @@ bt_bool bt_ctf_value_array_compare(const struct bt_ctf_value *object_a, BT_LOGT("Array values's elements are different: " "value-a-addr=%p, value-b-addr=%p, index=%d", element_obj_a, element_obj_b, i); - ret = BT_FALSE; + ret = BT_CTF_FALSE; goto end; } } @@ -435,10 +419,10 @@ end: } static -bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { - bt_bool ret = BT_TRUE; + bt_ctf_bool ret = BT_CTF_TRUE; GHashTableIter iter; gpointer key, element_obj_a; const struct bt_ctf_value_map *map_obj_a = BT_CTF_VALUE_TO_MAP(object_a); @@ -451,7 +435,7 @@ bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, object_a, object_b, bt_ctf_value_map_get_size(object_a), bt_ctf_value_map_get_size(object_b)); - ret = BT_FALSE; + ret = BT_CTF_FALSE; goto end; } @@ -468,7 +452,7 @@ bt_bool bt_ctf_value_map_compare(const struct bt_ctf_value *object_a, BT_LOGT("Map values's elements are different: " "value-a-addr=%p, value-b-addr=%p, key=\"%s\"", element_obj_a, element_obj_b, key_str); - ret = BT_FALSE; + ret = BT_CTF_FALSE; goto end; } } @@ -478,7 +462,7 @@ end: } static -bt_bool (* const compare_funcs[])(const struct bt_ctf_value *, +bt_ctf_bool (* const compare_funcs[])(const struct bt_ctf_value *, const struct bt_ctf_value *) = { [BT_CTF_VALUE_TYPE_NULL] = bt_ctf_value_null_compare, [BT_CTF_VALUE_TYPE_BOOL] = bt_ctf_value_bool_compare, @@ -497,7 +481,7 @@ void bt_ctf_value_null_freeze(struct bt_ctf_value *object) static void bt_ctf_value_generic_freeze(struct bt_ctf_value *object) { - object->frozen = BT_TRUE; + object->frozen = BT_CTF_TRUE; } static @@ -566,7 +550,7 @@ enum bt_ctf_value_status _bt_ctf_value_freeze(struct bt_ctf_value *object) { enum bt_ctf_value_status ret = BT_CTF_VALUE_STATUS_OK; - BT_ASSERT(object); + BT_ASSERT_DBG(object); if (object->frozen) { goto end; @@ -592,13 +576,13 @@ struct bt_ctf_value bt_ctf_value_create_base(enum bt_ctf_value_type type) struct bt_ctf_value value; value.type = type; - value.frozen = BT_FALSE; + value.frozen = BT_CTF_FALSE; bt_ctf_object_init_shared(&value.base, bt_ctf_value_destroy); return value; } BT_HIDDEN -struct bt_ctf_private_value *bt_ctf_private_value_bool_create_init(bt_bool val) +struct bt_ctf_private_value *bt_ctf_private_value_bool_create_init(bt_ctf_bool val) { struct bt_ctf_value_bool *bool_obj; @@ -620,7 +604,7 @@ end: BT_HIDDEN struct bt_ctf_private_value *bt_ctf_private_value_bool_create(void) { - return bt_ctf_private_value_bool_create_init(BT_FALSE); + return bt_ctf_private_value_bool_create_init(BT_CTF_FALSE); } BT_HIDDEN @@ -775,7 +759,7 @@ end: } BT_HIDDEN -bt_bool bt_ctf_value_bool_get(const struct bt_ctf_value *bool_obj) +bt_ctf_bool bt_ctf_value_bool_get(const struct bt_ctf_value *bool_obj) { BT_CTF_ASSERT_PRE_NON_NULL(bool_obj, "Value object"); BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_CTF_VALUE_TYPE_BOOL); @@ -783,7 +767,7 @@ bt_bool bt_ctf_value_bool_get(const struct bt_ctf_value *bool_obj) } BT_HIDDEN -void bt_ctf_private_value_bool_set(struct bt_ctf_private_value *bool_obj, bt_bool val) +void bt_ctf_private_value_bool_set(struct bt_ctf_private_value *bool_obj, bt_ctf_bool val) { BT_CTF_ASSERT_PRE_NON_NULL(bool_obj, "Value object"); BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(bool_obj, BT_CTF_VALUE_TYPE_BOOL); @@ -854,7 +838,7 @@ enum bt_ctf_value_status bt_ctf_private_value_string_set( } BT_HIDDEN -uint64_t bt_ctf_value_array_get_size(const struct bt_ctf_value *array_obj) +uint64_t bt_ctf_value_array_get_length(const struct bt_ctf_value *array_obj) { BT_CTF_ASSERT_PRE_NON_NULL(array_obj, "Value object"); BT_CTF_ASSERT_PRE_VALUE_IS_TYPE(array_obj, BT_CTF_VALUE_TYPE_ARRAY); @@ -907,7 +891,7 @@ enum bt_ctf_value_status bt_ctf_private_value_array_append_element( BT_HIDDEN enum bt_ctf_value_status bt_ctf_private_value_array_append_bool_element( - struct bt_ctf_private_value *array_obj, bt_bool val) + struct bt_ctf_private_value *array_obj, bt_ctf_bool val) { enum bt_ctf_value_status ret; struct bt_ctf_private_value *bool_obj = NULL; @@ -1039,7 +1023,7 @@ struct bt_ctf_private_value *bt_ctf_private_value_map_borrow_entry_value( } BT_HIDDEN -bt_bool bt_ctf_value_map_has_entry(const struct bt_ctf_value *map_obj, const char *key) +bt_ctf_bool bt_ctf_value_map_has_entry(const struct bt_ctf_value *map_obj, const char *key) { BT_CTF_ASSERT_PRE_NON_NULL(map_obj, "Value object"); BT_CTF_ASSERT_PRE_NON_NULL(key, "Key"); @@ -1069,7 +1053,7 @@ enum bt_ctf_value_status bt_ctf_private_value_map_insert_entry( BT_HIDDEN enum bt_ctf_value_status bt_ctf_private_value_map_insert_bool_entry( - struct bt_ctf_private_value *map_obj, const char *key, bt_bool val) + struct bt_ctf_private_value *map_obj, const char *key, bt_ctf_bool val) { enum bt_ctf_value_status ret; struct bt_ctf_private_value *bool_obj = NULL; @@ -1196,10 +1180,10 @@ struct extend_map_element_data { }; static -bt_bool extend_map_element(const char *key, +bt_ctf_bool extend_map_element(const char *key, struct bt_ctf_value *extension_obj_elem, void *data) { - bt_bool ret = BT_TRUE; + bt_ctf_bool ret = BT_CTF_TRUE; struct extend_map_element_data *extend_data = data; struct bt_ctf_private_value *extension_obj_elem_copy = NULL; @@ -1212,7 +1196,7 @@ bt_bool extend_map_element(const char *key, goto error; } - BT_ASSERT(extension_obj_elem_copy); + BT_ASSERT_DBG(extension_obj_elem_copy); /* Replace in extended object */ extend_data->status = bt_ctf_private_value_map_insert_entry( @@ -1229,8 +1213,8 @@ bt_bool extend_map_element(const char *key, goto end; error: - BT_ASSERT(extend_data->status != BT_CTF_VALUE_STATUS_OK); - ret = BT_FALSE; + BT_ASSERT_DBG(extend_data->status != BT_CTF_VALUE_STATUS_OK); + ret = BT_CTF_FALSE; end: BT_CTF_OBJECT_PUT_REF_AND_RESET(extension_obj_elem_copy); @@ -1266,7 +1250,7 @@ enum bt_ctf_value_status bt_ctf_value_map_extend( goto error; } - BT_ASSERT(extended_map_obj); + BT_ASSERT_DBG(extended_map_obj); /* * For each key in the extension map object, replace this key @@ -1322,10 +1306,10 @@ enum bt_ctf_value_status bt_ctf_value_copy(struct bt_ctf_private_value **copy_ob } BT_HIDDEN -bt_bool bt_ctf_value_compare(const struct bt_ctf_value *object_a, +bt_ctf_bool bt_ctf_value_compare(const struct bt_ctf_value *object_a, const struct bt_ctf_value *object_b) { - bt_bool ret = BT_FALSE; + bt_ctf_bool ret = BT_CTF_FALSE; BT_CTF_ASSERT_PRE_NON_NULL(object_a, "Value object A"); BT_CTF_ASSERT_PRE_NON_NULL(object_b, "Value object B");