X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-class.c;h=97c8523c6972eaafb65ef4a61a62a918b47646c9;hb=d98421f2abfc5adab28ab7ee9b63537a6c7261cc;hp=90f6034006c5bc5b16ab39920734d5b48a0f9a6b;hpb=0aa006b7775f9578e37c0f006df795e903d25acc;p=babeltrace.git diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c index 90f60340..97c8523c 100644 --- a/src/lib/trace-ir/field-class.c +++ b/src/lib/trace-ir/field-class.c @@ -1,33 +1,15 @@ /* + * SPDX-License-Identifier: MIT + * * Copyright 2017-2018 Philippe Proulx * Copyright 2013, 2014 Jérémie Galarneau - * - * 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 "LIB/FIELD-CLASS" #include "lib/logging.h" -#include "lib/assert-pre.h" +#include "lib/assert-cond.h" #include -#include -#include #include #include #include "lib/object.h" @@ -37,6 +19,7 @@ #include "compat/glib.h" #include #include +#include #include #include "clock-class.h" @@ -97,6 +80,7 @@ struct bt_field_class *bt_field_class_bit_array_create( { struct bt_field_class_bit_array *ba_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_ASSERT_PRE(length > 0 && length <= 64, "Unsupported length for bit array field class " @@ -149,6 +133,7 @@ struct bt_field_class *bt_field_class_bool_create( { struct bt_field_class_bool *bool_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_LOGD("Creating default boolean field class object."); bool_fc = g_new0(struct bt_field_class_bool, 1); @@ -235,6 +220,8 @@ end: struct bt_field_class *bt_field_class_integer_unsigned_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_integer_field_class(trace_class, BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER); } @@ -242,6 +229,8 @@ struct bt_field_class *bt_field_class_integer_unsigned_create( struct bt_field_class *bt_field_class_integer_signed_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_integer_field_class(trace_class, BT_FIELD_CLASS_TYPE_SIGNED_INTEGER); } @@ -272,9 +261,9 @@ void bt_field_class_integer_set_field_value_range( BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_IS_INT(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); - BT_ASSERT_PRE(size <= 64, + BT_ASSERT_PRE(size >= 1 && size <= 64, "Unsupported size for integer field class's field value range " - "(maximum is 64): size=%" PRIu64, size); + "(minimum is 1, maximum is 64): size=%" PRIu64, size); BT_ASSERT_PRE( int_fc->common.type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || int_fc->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || @@ -399,6 +388,8 @@ end: struct bt_field_class *bt_field_class_enumeration_unsigned_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_enumeration_field_class(trace_class, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION); } @@ -406,6 +397,8 @@ struct bt_field_class *bt_field_class_enumeration_unsigned_create( struct bt_field_class *bt_field_class_enumeration_signed_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_enumeration_field_class(trace_class, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION); } @@ -454,7 +447,7 @@ borrow_enumeration_field_class_mapping_by_label( struct bt_field_class_enumeration_mapping *mapping = NULL; uint64_t i; - BT_ASSERT(fc); + BT_ASSERT_DBG(fc); BT_ASSERT_PRE_DEV_NON_NULL(label, "Label"); for (i = 0; i < fc->mappings->len; i++) { @@ -531,6 +524,7 @@ bt_field_class_enumeration_unsigned_get_mapping_labels_for_value( const struct bt_field_class_enumeration *enum_fc = (const void *) fc; uint64_t i; + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)"); BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)"); @@ -571,6 +565,7 @@ bt_field_class_enumeration_signed_get_mapping_labels_for_value( const struct bt_field_class_enumeration *enum_fc = (const void *) fc; uint64_t i; + BT_ASSERT_PRE_DEV_NO_ERROR(); BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_NON_NULL(label_array, "Label array (output)"); BT_ASSERT_PRE_DEV_NON_NULL(count, "Count (output)"); @@ -637,6 +632,7 @@ add_mapping_to_enumeration_field_class(struct bt_field_class *fc, struct bt_field_class_enumeration *enum_fc = (void *) fc; struct bt_field_class_enumeration_mapping mapping = { 0 }; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT(fc); BT_ASSERT_PRE_NON_NULL(label, "Label"); BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set"); @@ -666,6 +662,7 @@ bt_field_class_enumeration_unsigned_add_mapping( struct bt_field_class *fc, const char *label, const struct bt_integer_range_set_unsigned *range_set) { + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class"); @@ -678,6 +675,7 @@ bt_field_class_enumeration_signed_add_mapping( struct bt_field_class *fc, const char *label, const struct bt_integer_range_set_signed *range_set) { + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class"); @@ -726,6 +724,8 @@ end: struct bt_field_class *bt_field_class_real_single_precision_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_real_field_class(trace_class, BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL); } @@ -733,6 +733,8 @@ struct bt_field_class *bt_field_class_real_single_precision_create( struct bt_field_class *bt_field_class_real_double_precision_create( bt_trace_class *trace_class) { + BT_ASSERT_PRE_NO_ERROR(); + return create_real_field_class(trace_class, BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL); } @@ -801,9 +803,9 @@ void destroy_named_field_class(gpointer ptr) } static -void destroy_variant_with_selector_option(gpointer ptr) +void destroy_variant_with_selector_field_option(gpointer ptr) { - struct bt_field_class_variant_with_selector_option *opt = ptr; + struct bt_field_class_variant_with_selector_field_option *opt = ptr; if (ptr) { finalize_named_field_class(&opt->common); @@ -846,6 +848,7 @@ struct bt_field_class *bt_field_class_structure_create( int ret; struct bt_field_class_structure *struct_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_LOGD_STR("Creating default structure field class object."); struct_fc = g_new0(struct bt_field_class_structure, 1); @@ -898,7 +901,7 @@ int init_named_field_class(struct bt_named_field_class *named_fc, } named_fc->fc = fc; - bt_object_get_no_null_check(named_fc->fc); + bt_object_get_ref_no_null_check(named_fc->fc); end: return status; @@ -933,13 +936,13 @@ end: } static -struct bt_field_class_variant_with_selector_option * -create_variant_with_selector_option( +struct bt_field_class_variant_with_selector_field_option * +create_variant_with_selector_field_option( const char *name, struct bt_field_class *fc, const struct bt_integer_range_set *range_set) { - struct bt_field_class_variant_with_selector_option *opt = g_new0( - struct bt_field_class_variant_with_selector_option, 1); + struct bt_field_class_variant_with_selector_field_option *opt = g_new0( + struct bt_field_class_variant_with_selector_field_option, 1); BT_ASSERT(range_set); @@ -954,12 +957,12 @@ create_variant_with_selector_option( } opt->range_set = range_set; - bt_object_get_no_null_check(opt->range_set); + bt_object_get_ref_no_null_check(opt->range_set); bt_integer_range_set_freeze(range_set); goto end; error: - destroy_variant_with_selector_option(opt); + destroy_variant_with_selector_field_option(opt); opt = NULL; end: @@ -1000,6 +1003,7 @@ bt_field_class_structure_append_member( enum bt_field_class_structure_append_member_status status; struct bt_named_field_class *named_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, "Field class"); @@ -1038,7 +1042,7 @@ borrow_named_field_class_from_container_field_class_at_index( struct bt_field_class_named_field_class_container *fc, uint64_t index) { - BT_ASSERT(fc); + BT_ASSERT_DBG(fc); BT_ASSERT_PRE_DEV_VALID_INDEX(index, fc->named_fcs->len); return fc->named_fcs->pdata[index]; } @@ -1077,7 +1081,7 @@ borrow_named_field_class_from_container_field_class_by_name( gpointer orig_key; gpointer value; - BT_ASSERT(fc); + BT_ASSERT_DBG(fc); BT_ASSERT_PRE_DEV_NON_NULL(name, "Name"); if (!g_hash_table_lookup_extended(fc->name_to_index, name, &orig_key, &value)) { @@ -1154,8 +1158,8 @@ void destroy_option_field_class(struct bt_object *obj) BT_LOGD_STR("Putting content field class."); BT_OBJECT_PUT_REF_AND_RESET(fc->content_fc); - if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) { - struct bt_field_class_option_with_selector *with_sel_fc = + if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) { + struct bt_field_class_option_with_selector_field *with_sel_fc = (void *) obj; BT_LOGD_STR("Putting selector field path."); @@ -1163,8 +1167,8 @@ void destroy_option_field_class(struct bt_object *obj) BT_LOGD_STR("Putting selector field class."); BT_OBJECT_PUT_REF_AND_RESET(with_sel_fc->selector_fc); - if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR) { - struct bt_field_class_option_with_selector_integer *with_int_sel_fc = + if (fc->common.type != BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) { + struct bt_field_class_option_with_selector_field_integer *with_int_sel_fc = (void *) obj; BT_LOGD_STR("Putting integer range set."); @@ -1191,22 +1195,22 @@ struct bt_field_class *create_option_field_class( bt_common_field_class_type_string(fc_type), content_fc, selector_fc); - if (fc_type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR) { - struct bt_field_class_option_with_selector *opt_with_sel_fc = NULL; + if (fc_type != BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) { + struct bt_field_class_option_with_selector_field *opt_with_sel_fc = NULL; BT_ASSERT_PRE_NON_NULL(selector_fc, "Selector field class"); - if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR) { + if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) { BT_ASSERT_PRE_FC_HAS_ID(selector_fc, BT_FIELD_CLASS_TYPE_BOOL, "Selector field class"); opt_with_sel_fc = (void *) g_new0( - struct bt_field_class_option_with_selector_bool, 1); + struct bt_field_class_option_with_selector_field_bool, 1); } else { BT_ASSERT_PRE_FC_IS_INT(selector_fc, "Selector field class"); opt_with_sel_fc = (void *) g_new0( - struct bt_field_class_option_with_selector_integer, 1); + struct bt_field_class_option_with_selector_field_integer, 1); } if (!opt_with_sel_fc) { @@ -1216,7 +1220,7 @@ struct bt_field_class *create_option_field_class( } opt_with_sel_fc->selector_fc = selector_fc; - bt_object_get_no_null_check(opt_with_sel_fc->selector_fc); + bt_object_get_ref_no_null_check(opt_with_sel_fc->selector_fc); opt_fc = (void *) opt_with_sel_fc; } else { opt_fc = g_new0(struct bt_field_class_option, 1); @@ -1235,7 +1239,7 @@ struct bt_field_class *create_option_field_class( } opt_fc->content_fc = content_fc; - bt_object_get_no_null_check(opt_fc->content_fc); + bt_object_get_ref_no_null_check(opt_fc->content_fc); bt_field_class_freeze(opt_fc->content_fc); if (selector_fc) { @@ -1257,45 +1261,42 @@ struct bt_field_class *bt_field_class_option_without_selector_create( struct bt_trace_class *trace_class, struct bt_field_class *content_fc) { + BT_ASSERT_PRE_NO_ERROR(); + return create_option_field_class(trace_class, - BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR, + BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD, content_fc, NULL); } -struct bt_field_class *bt_field_class_option_with_selector_bool_create( +struct bt_field_class *bt_field_class_option_with_selector_field_bool_create( struct bt_trace_class *trace_class, struct bt_field_class *content_fc, struct bt_field_class *selector_fc) { - struct bt_field_class_option_with_selector_bool *fc = - (void *) create_option_field_class(trace_class, - BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR, - content_fc, selector_fc); - - if (!fc) { - goto end; - } + BT_ASSERT_PRE_NO_ERROR(); -end: - return (void *) fc; + return create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, + content_fc, selector_fc); } struct bt_field_class * -bt_field_class_option_with_selector_integer_unsigned_create( +bt_field_class_option_with_selector_field_integer_unsigned_create( struct bt_trace_class *trace_class, struct bt_field_class *content_fc, struct bt_field_class *selector_fc, const struct bt_integer_range_set_unsigned *u_range_set) { - struct bt_field_class_option_with_selector_integer *fc; + struct bt_field_class_option_with_selector_field_integer *fc; const struct bt_integer_range_set *range_set = (const void *) u_range_set; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set"); BT_ASSERT_PRE(range_set->ranges->len > 0, "Integer range set is empty: %!+R", range_set); fc = (void *) create_option_field_class(trace_class, - BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR, + BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, content_fc, selector_fc); if (!fc) { @@ -1303,7 +1304,7 @@ bt_field_class_option_with_selector_integer_unsigned_create( } fc->range_set = range_set; - bt_object_get_no_null_check(fc->range_set); + bt_object_get_ref_no_null_check(fc->range_set); bt_integer_range_set_freeze(range_set); end: @@ -1311,21 +1312,22 @@ end: } struct bt_field_class * -bt_field_class_option_with_selector_integer_signed_create( +bt_field_class_option_with_selector_field_integer_signed_create( struct bt_trace_class *trace_class, struct bt_field_class *content_fc, struct bt_field_class *selector_fc, const struct bt_integer_range_set_signed *i_range_set) { - struct bt_field_class_option_with_selector_integer *fc; + struct bt_field_class_option_with_selector_field_integer *fc; const struct bt_integer_range_set *range_set = (const void *) i_range_set; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set"); BT_ASSERT_PRE(range_set->ranges->len > 0, "Integer range set is empty: %!+R", range_set); fc = (void *) create_option_field_class(trace_class, - BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR, + BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD, content_fc, selector_fc); if (!fc) { @@ -1333,7 +1335,7 @@ bt_field_class_option_with_selector_integer_signed_create( } fc->range_set = range_set; - bt_object_get_no_null_check(fc->range_set); + bt_object_get_ref_no_null_check(fc->range_set); bt_integer_range_set_freeze(range_set); end: @@ -1361,10 +1363,10 @@ struct bt_field_class *bt_field_class_option_borrow_field_class( } const struct bt_field_path * -bt_field_class_option_with_selector_borrow_selector_field_path_const( +bt_field_class_option_with_selector_field_borrow_selector_field_path_const( const struct bt_field_class *fc) { - const struct bt_field_class_option_with_selector *opt_fc = + const struct bt_field_class_option_with_selector_field *opt_fc = (const void *) fc; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); @@ -1372,34 +1374,34 @@ bt_field_class_option_with_selector_borrow_selector_field_path_const( return opt_fc->selector_field_path; } -void bt_field_class_option_with_selector_bool_set_selector_is_reversed( +void bt_field_class_option_with_selector_field_bool_set_selector_is_reversed( struct bt_field_class *fc, bt_bool sel_is_reversed) { - struct bt_field_class_option_with_selector_bool *opt_fc = (void *) fc; + struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR, "Field class"); + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, "Field class"); BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); opt_fc->sel_is_reversed = sel_is_reversed; } -bt_bool bt_field_class_option_with_selector_bool_selector_is_reversed( +bt_bool bt_field_class_option_with_selector_field_bool_selector_is_reversed( const struct bt_field_class *fc) { - struct bt_field_class_option_with_selector_bool *opt_fc = (void *) fc; + struct bt_field_class_option_with_selector_field_bool *opt_fc = (void *) fc; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR, "Field class"); + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, "Field class"); return opt_fc->sel_is_reversed; } const struct bt_integer_range_set_unsigned * -bt_field_class_option_with_selector_integer_unsigned_borrow_selector_ranges_const( +bt_field_class_option_with_selector_field_integer_unsigned_borrow_selector_ranges_const( const struct bt_field_class *fc) { - struct bt_field_class_option_with_selector_integer *opt_fc = + struct bt_field_class_option_with_selector_field_integer *opt_fc = (void *) fc; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); @@ -1408,10 +1410,10 @@ bt_field_class_option_with_selector_integer_unsigned_borrow_selector_ranges_cons } const struct bt_integer_range_set_signed * -bt_field_class_option_with_selector_integer_signed_borrow_selector_ranges_const( +bt_field_class_option_with_selector_field_integer_signed_borrow_selector_ranges_const( const struct bt_field_class *fc) { - struct bt_field_class_option_with_selector_integer *opt_fc = + struct bt_field_class_option_with_selector_field_integer *opt_fc = (void *) fc; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); @@ -1439,9 +1441,9 @@ void destroy_variant_field_class(struct bt_object *obj) } static -void destroy_variant_with_selector_field_class(struct bt_object *obj) +void destroy_variant_with_selector_field_field_class(struct bt_object *obj) { - struct bt_field_class_variant_with_selector *fc = (void *) obj; + struct bt_field_class_variant_with_selector_field *fc = (void *) obj; BT_ASSERT(fc); finalize_variant_field_class(&fc->common); @@ -1457,9 +1459,10 @@ struct bt_field_class *bt_field_class_variant_create( { int ret; struct bt_field_class_variant *var_fc = NULL; - struct bt_field_class_variant_with_selector *var_with_sel_fc = NULL; + struct bt_field_class_variant_with_selector_field *var_with_sel_fc = NULL; enum bt_field_class_type fc_type; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); if (selector_fc) { @@ -1471,33 +1474,35 @@ struct bt_field_class *bt_field_class_variant_create( if (selector_fc) { var_with_sel_fc = g_new0( - struct bt_field_class_variant_with_selector, 1); + struct bt_field_class_variant_with_selector_field, 1); if (!var_with_sel_fc) { BT_LIB_LOGE_APPEND_CAUSE( "Failed to allocate one variant field class with selector."); goto error; } - if (selector_fc->type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || - selector_fc->type == BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION) { - fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR; + if (bt_field_class_type_is(selector_fc->type, + BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER)) { + fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD; } else { - fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR; + fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD; } ret = init_named_field_classes_container( (void *) var_with_sel_fc, fc_type, - destroy_variant_with_selector_field_class, - destroy_variant_with_selector_option); + destroy_variant_with_selector_field_field_class, + destroy_variant_with_selector_field_option); if (ret) { /* init_named_field_classes_container() logs errors */ goto error; } var_with_sel_fc->selector_fc = selector_fc; - bt_object_get_no_null_check(var_with_sel_fc->selector_fc); + bt_object_get_ref_no_null_check(var_with_sel_fc->selector_fc); bt_field_class_freeze(selector_fc); var_fc = (void *) var_with_sel_fc; + BT_LIB_LOGD("Created default variant field class with selector object: " + "%![var-fc-]+F, %![sel-fc-]+F", var_fc, selector_fc); } else { var_fc = g_new0(struct bt_field_class_variant, 1); if (!var_fc) { @@ -1507,21 +1512,22 @@ struct bt_field_class *bt_field_class_variant_create( } ret = init_named_field_classes_container((void *) var_fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD, destroy_variant_field_class, destroy_named_field_class); if (ret) { /* init_named_field_classes_container() logs errors */ goto error; } + BT_LIB_LOGD("Created default variant field class without selector object: " + "%![var-fc-]+F", var_fc); } BT_ASSERT(var_fc); - BT_LIB_LOGD("Created default variant field class with selector object: " - "%![var-fc-]+F, %![sel-fc-]+F", var_fc, selector_fc); goto end; error: BT_OBJECT_PUT_REF_AND_RESET(var_fc); + BT_OBJECT_PUT_REF_AND_RESET(var_with_sel_fc); end: return (void *) var_fc; @@ -1534,11 +1540,12 @@ bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc, enum bt_field_class_variant_without_selector_append_option_status status; struct bt_named_field_class *named_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_NON_NULL(name, "Name"); BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR, "Field class"); + BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD, "Field class"); named_fc = create_named_field_class(name, option_fc); if (!named_fc) { /* create_named_field_class() logs errors */ @@ -1589,7 +1596,7 @@ int ranges_overlap(GPtrArray *var_fc_opts, const struct bt_integer_range_set *ra /* Add existing option ranges */ for (i = 0; i < var_fc_opts->len; i++) { - struct bt_field_class_variant_with_selector_option *opt = + struct bt_field_class_variant_with_selector_field_option *opt = var_fc_opts->pdata[i]; uint64_t j; @@ -1647,15 +1654,15 @@ end: } static -int append_option_to_variant_with_selector_field_class( +int append_option_to_variant_with_selector_field_field_class( struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc, const struct bt_integer_range_set *range_set, enum bt_field_class_type expected_type) { int status; - struct bt_field_class_variant_with_selector *var_fc = (void *) fc; - struct bt_field_class_variant_with_selector_option *opt = NULL; + struct bt_field_class_variant_with_selector_field *var_fc = (void *) fc; + struct bt_field_class_variant_with_selector_field_option *opt = NULL; bool has_overlap; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); @@ -1666,7 +1673,7 @@ int append_option_to_variant_with_selector_field_class( BT_ASSERT_PRE(range_set->ranges->len > 0, "Integer range set is empty: %!+R", range_set); status = ranges_overlap(var_fc->common.common.named_fcs, range_set, - expected_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, + expected_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, &has_overlap); if (status) { /* ranges_overlap() logs errors */ @@ -1676,9 +1683,9 @@ int append_option_to_variant_with_selector_field_class( BT_ASSERT_PRE(!has_overlap, "Integer range set's ranges and existing ranges have an overlap: " "%!+R", range_set); - opt = create_variant_with_selector_option(name, option_fc, range_set); + opt = create_variant_with_selector_field_option(name, option_fc, range_set); if (!opt) { - /* create_variant_with_selector_option() logs errors */ + /* create_variant_with_selector_field_option() logs errors */ status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -1692,32 +1699,36 @@ int append_option_to_variant_with_selector_field_class( end: if (opt) { - destroy_variant_with_selector_option(opt); + destroy_variant_with_selector_field_option(opt); } return status; } -enum bt_field_class_variant_with_selector_append_option_status -bt_field_class_variant_with_selector_unsigned_append_option( +enum bt_field_class_variant_with_selector_field_integer_append_option_status +bt_field_class_variant_with_selector_field_integer_unsigned_append_option( struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc, const struct bt_integer_range_set_unsigned *range_set) { - return append_option_to_variant_with_selector_field_class(fc, + BT_ASSERT_PRE_NO_ERROR(); + + return append_option_to_variant_with_selector_field_field_class(fc, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD); } -enum bt_field_class_variant_with_selector_append_option_status -bt_field_class_variant_with_selector_signed_append_option( +enum bt_field_class_variant_with_selector_field_integer_append_option_status +bt_field_class_variant_with_selector_field_integer_signed_append_option( struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc, const struct bt_integer_range_set_signed *range_set) { - return append_option_to_variant_with_selector_field_class(fc, + BT_ASSERT_PRE_NO_ERROR(); + + return append_option_to_variant_with_selector_field_field_class(fc, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD); } uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc) @@ -1773,52 +1784,52 @@ bt_field_class_variant_borrow_option_by_index( (void *) fc, index); } -const struct bt_field_class_variant_with_selector_unsigned_option * -bt_field_class_variant_with_selector_unsigned_borrow_option_by_name_const( +const struct bt_field_class_variant_with_selector_field_integer_unsigned_option * +bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_name_const( const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name); } -const struct bt_field_class_variant_with_selector_unsigned_option * -bt_field_class_variant_with_selector_unsigned_borrow_option_by_index_const( +const struct bt_field_class_variant_with_selector_field_integer_unsigned_option * +bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const( const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( (void *) fc, index); } -const struct bt_field_class_variant_with_selector_signed_option * -bt_field_class_variant_with_selector_signed_borrow_option_by_name_const( +const struct bt_field_class_variant_with_selector_field_integer_signed_option * +bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_name_const( const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name); } -const struct bt_field_class_variant_with_selector_signed_option * -bt_field_class_variant_with_selector_signed_borrow_option_by_index_const( +const struct bt_field_class_variant_with_selector_field_integer_signed_option * +bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const( const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( @@ -1855,10 +1866,10 @@ bt_field_class_variant_option_borrow_field_class( } const struct bt_integer_range_set_unsigned * -bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const( - const struct bt_field_class_variant_with_selector_unsigned_option *option) +bt_field_class_variant_with_selector_field_integer_unsigned_option_borrow_ranges_const( + const struct bt_field_class_variant_with_selector_field_integer_unsigned_option *option) { - const struct bt_field_class_variant_with_selector_option *opt = + const struct bt_field_class_variant_with_selector_field_option *opt = (const void *) option; BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option"); @@ -1866,10 +1877,10 @@ bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const( } const struct bt_integer_range_set_signed * -bt_field_class_variant_with_selector_signed_option_borrow_ranges_const( - const struct bt_field_class_variant_with_selector_signed_option *option) +bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_const( + const struct bt_field_class_variant_with_selector_field_integer_signed_option *option) { - const struct bt_field_class_variant_with_selector_option *opt = + const struct bt_field_class_variant_with_selector_field_option *opt = (const void *) option; BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option"); @@ -1877,10 +1888,10 @@ bt_field_class_variant_with_selector_signed_option_borrow_ranges_const( } const struct bt_field_path * -bt_field_class_variant_with_selector_borrow_selector_field_path_const( +bt_field_class_variant_with_selector_field_borrow_selector_field_path_const( const struct bt_field_class *fc) { - const struct bt_field_class_variant_with_selector *var_fc = + const struct bt_field_class_variant_with_selector_field *var_fc = (const void *) fc; BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); @@ -1902,7 +1913,7 @@ int init_array_field_class(struct bt_field_class_array *fc, } fc->element_fc = element_fc; - bt_object_get_no_null_check(fc->element_fc); + bt_object_get_ref_no_null_check(fc->element_fc); bt_field_class_freeze(element_fc); end: @@ -1933,6 +1944,7 @@ bt_field_class_array_static_create(bt_trace_class *trace_class, { struct bt_field_class_array_static *array_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class"); BT_LOGD_STR("Creating default static array field class object."); @@ -2013,6 +2025,7 @@ struct bt_field_class *bt_field_class_array_dynamic_create( { struct bt_field_class_array_dynamic *array_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class"); BT_LOGD_STR("Creating default dynamic array field class object."); @@ -2024,7 +2037,9 @@ struct bt_field_class *bt_field_class_array_dynamic_create( } if (init_array_field_class((void *) array_fc, - BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, + length_fc ? + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD : + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD, destroy_dynamic_array_field_class, element_fc)) { goto error; } @@ -2033,7 +2048,7 @@ struct bt_field_class *bt_field_class_array_dynamic_create( BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc, "Length field class"); array_fc->length_fc = length_fc; - bt_object_get_no_null_check(array_fc->length_fc); + bt_object_get_ref_no_null_check(array_fc->length_fc); bt_field_class_freeze(length_fc); } @@ -2048,13 +2063,15 @@ end: } const struct bt_field_path * -bt_field_class_array_dynamic_borrow_length_field_path_const( +bt_field_class_array_dynamic_with_length_field_borrow_length_field_path_const( const struct bt_field_class *fc) { const struct bt_field_class_array_dynamic *seq_fc = (const void *) fc; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, + BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD, "Field class"); return seq_fc->length_field_path; } @@ -2072,6 +2089,7 @@ struct bt_field_class *bt_field_class_string_create(bt_trace_class *trace_class) { struct bt_field_class_string *string_fc = NULL; + BT_ASSERT_PRE_NO_ERROR(); BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); BT_LOGD_STR("Creating default string field class object."); string_fc = g_new0(struct bt_field_class_string, 1); @@ -2109,12 +2127,9 @@ void _bt_field_class_freeze(const struct bt_field_class *c_fc) bt_value_freeze(fc->user_attributes); fc->frozen = true; - switch (fc->type) { - case BT_FIELD_CLASS_TYPE_STRUCTURE: - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { + if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; uint64_t i; @@ -2123,11 +2138,6 @@ void _bt_field_class_freeze(const struct bt_field_class *c_fc) bt_named_field_class_freeze( container_fc->named_fcs->pdata[i]); } - - break; - } - default: - break; } } @@ -2152,12 +2162,9 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) "Field class is already part of a trace: %!+F", fc); fc->part_of_trace_class = true; - switch (fc->type) { - case BT_FIELD_CLASS_TYPE_STRUCTURE: - case BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR: - case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR: - { + if (fc->type == BT_FIELD_CLASS_TYPE_STRUCTURE || + bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_VARIANT)) { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; uint64_t i; @@ -2168,19 +2175,11 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) bt_field_class_make_part_of_trace_class(named_fc->fc); } - - break; - } - case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: - { + } else if (bt_field_class_type_is(fc->type, + BT_FIELD_CLASS_TYPE_ARRAY)) { struct bt_field_class_array *array_fc = (void *) fc; bt_field_class_make_part_of_trace_class(array_fc->element_fc); - break; - } - default: - break; } } @@ -2208,9 +2207,9 @@ void bt_field_class_set_user_attributes( BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP, "User attributes object is not a map value object."); BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); - bt_object_put_no_null_check(fc->user_attributes); + bt_object_put_ref_no_null_check(fc->user_attributes); fc->user_attributes = (void *) user_attributes; - bt_object_get_no_null_check(fc->user_attributes); + bt_object_get_ref_no_null_check(fc->user_attributes); } static @@ -2231,9 +2230,9 @@ void bt_named_field_class_set_user_attributes( BT_ASSERT_PRE_DEV_HOT(named_fc, "Structure field class member or variant field class option", "."); - bt_object_put_no_null_check(named_fc->user_attributes); + bt_object_put_ref_no_null_check(named_fc->user_attributes); named_fc->user_attributes = (void *) user_attributes; - bt_object_get_no_null_check(named_fc->user_attributes); + bt_object_get_ref_no_null_check(named_fc->user_attributes); } const struct bt_value *