X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-class.c;h=2a9230252243ba1aec674cf23078ceea8f99b055;hb=1e123ed605bf4936226d675e6725691bff249f7f;hp=97409dc98222e21d68a673395a7b1d7d71dc8d5e;hpb=c6962c968f7467ce8f7e880e7de3797139314f9f;p=babeltrace.git diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c index 97409dc9..2a923025 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" @@ -51,7 +34,7 @@ enum bt_field_class_type bt_field_class_get_type( const struct bt_field_class *fc) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); return fc->type; } @@ -97,8 +80,9 @@ struct bt_field_class *bt_field_class_bit_array_create( { struct bt_field_class_bit_array *ba_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); - BT_ASSERT_PRE(length > 0 && length <= 64, + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); + BT_ASSERT_PRE("valid-length", length > 0 && length <= 64, "Unsupported length for bit array field class " "(minimum is 1, maximum is 64): length=%" PRIu64, length); BT_LOGD("Creating default bit array field class object."); @@ -129,9 +113,9 @@ uint64_t bt_field_class_bit_array_get_length(const struct bt_field_class *fc) { const struct bt_field_class_bit_array *ba_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_BIT_ARRAY, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "bit-array", + BT_FIELD_CLASS_TYPE_BIT_ARRAY, "Field class"); return ba_fc->length; } @@ -149,7 +133,8 @@ struct bt_field_class *bt_field_class_bool_create( { struct bt_field_class_bool *bool_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); BT_LOGD("Creating default boolean field class object."); bool_fc = g_new0(struct bt_field_class_bool, 1); if (!bool_fc) { @@ -207,7 +192,7 @@ struct bt_field_class *create_integer_field_class(bt_trace_class *trace_class, { struct bt_field_class_integer *int_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); BT_LOGD("Creating default integer field class object: type=%s", bt_common_field_class_type_string(type)); int_fc = g_new0(struct bt_field_class_integer, 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); } @@ -251,8 +240,8 @@ uint64_t bt_field_class_integer_get_field_value_range( { const struct bt_field_class_integer *int_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_INT("field-class", fc, "Field class"); return int_fc->range; } @@ -269,13 +258,14 @@ void bt_field_class_integer_set_field_value_range( { struct bt_field_class_integer *int_fc = (void *) fc; - 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_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_INT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_HOT(fc); + BT_ASSERT_PRE("valid-n", + size >= 1 && size <= 64, "Unsupported size for integer field class's field value range " - "(maximum is 64): size=%" PRIu64, size); - BT_ASSERT_PRE( + "(minimum is 1, maximum is 64): size=%" PRIu64, size); + BT_ASSERT_PRE("valid-n-for-enumeration-field-class", int_fc->common.type == BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER || int_fc->common.type == BT_FIELD_CLASS_TYPE_SIGNED_INTEGER || size_is_valid_for_enumeration_field_class(fc, size), @@ -291,8 +281,8 @@ bt_field_class_integer_get_preferred_display_base(const struct bt_field_class *f { const struct bt_field_class_integer *int_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_INT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_INT("field-class", fc, "Field class"); return int_fc->base; } @@ -302,9 +292,9 @@ void bt_field_class_integer_set_preferred_display_base( { struct bt_field_class_integer *int_fc = (void *) fc; - 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_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_INT("field-class", fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_HOT(fc); int_fc->base = base; BT_LIB_LOGD("Set integer field class's preferred display base: %!+F", fc); } @@ -358,7 +348,7 @@ struct bt_field_class *create_enumeration_field_class( { struct bt_field_class_enumeration *enum_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); BT_LOGD("Creating default enumeration field class object: type=%s", bt_common_field_class_type_string(type)); enum_fc = g_new0(struct bt_field_class_enumeration, 1); @@ -399,6 +389,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 +398,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); } @@ -415,8 +409,8 @@ uint64_t bt_field_class_enumeration_get_mapping_count( { const struct bt_field_class_enumeration *enum_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_ENUM(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_ENUM("field-class", fc, "Field class"); return (uint64_t) enum_fc->mappings->len; } @@ -426,10 +420,10 @@ bt_field_class_enumeration_unsigned_borrow_mapping_by_index_const( { const struct bt_field_class_enumeration *enum_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration", + BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class"); return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index); } @@ -439,23 +433,25 @@ bt_field_class_enumeration_signed_borrow_mapping_by_index_const( { const struct bt_field_class_enumeration *enum_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); BT_ASSERT_PRE_DEV_VALID_INDEX(index, enum_fc->mappings->len); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration", + BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class"); return (const void *) BT_FIELD_CLASS_ENUM_MAPPING_AT_INDEX(fc, index); } static const struct bt_field_class_enumeration_mapping * borrow_enumeration_field_class_mapping_by_label( - const struct bt_field_class_enumeration *fc, const char *label) + const struct bt_field_class_enumeration *fc, const char *label, + const char *api_func) { struct bt_field_class_enumeration_mapping *mapping = NULL; uint64_t i; - BT_ASSERT(fc); - BT_ASSERT_PRE_DEV_NON_NULL(label, "Label"); + BT_ASSERT_DBG(fc); + BT_ASSERT_PRE_DEV_NON_NULL_FROM_FUNC(api_func, "label", label, + "Label"); for (i = 0; i < fc->mappings->len; i++) { struct bt_field_class_enumeration_mapping *this_mapping = @@ -475,28 +471,29 @@ const struct bt_field_class_enumeration_signed_mapping * bt_field_class_enumeration_signed_borrow_mapping_by_label_const( const struct bt_field_class *fc, const char *label) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration", + BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class"); return (const void *) borrow_enumeration_field_class_mapping_by_label( - (const void *) fc, label); + (const void *) fc, label, __func__); } const struct bt_field_class_enumeration_unsigned_mapping * bt_field_class_enumeration_unsigned_borrow_mapping_by_label_const( const struct bt_field_class *fc, const char *label) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration", BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class"); return (const void *) borrow_enumeration_field_class_mapping_by_label( - (const void *) fc, label); + (const void *) fc, label, __func__); } const char *bt_field_class_enumeration_mapping_get_label( const struct bt_field_class_enumeration_mapping *mapping) { - BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping"); + BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping", + mapping, "Enumeration field class mapping"); return mapping->label->str; } @@ -507,7 +504,8 @@ bt_field_class_enumeration_unsigned_mapping_borrow_ranges_const( const struct bt_field_class_enumeration_mapping *mapping = (const void *) u_mapping; - BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping"); + BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping", + mapping, "Enumeration field class mapping"); return (const void *) mapping->range_set; } @@ -518,7 +516,8 @@ bt_field_class_enumeration_signed_mapping_borrow_ranges_const( const struct bt_field_class_enumeration_mapping *mapping = (const void *) s_mapping; - BT_ASSERT_PRE_DEV_NON_NULL(mapping, "Enumeration field class mapping"); + BT_ASSERT_PRE_DEV_NON_NULL("enumeration-field-class-mapping", + mapping, "Enumeration field class mapping"); return (const void *) mapping->range_set; } @@ -531,11 +530,13 @@ 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_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)"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_DEV_NO_ERROR(); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array, + "Label array (output)"); + BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)"); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "unsigned-enumeration", + BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class"); g_ptr_array_set_size(enum_fc->label_buf, 0); for (i = 0; i < enum_fc->mappings->len; i++) { @@ -571,11 +572,13 @@ 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_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)"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_DEV_NO_ERROR(); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_NON_NULL("label-array-output", label_array, + "Label array (output)"); + BT_ASSERT_PRE_DEV_NON_NULL("count-output", count, "Count (output)"); + BT_ASSERT_PRE_DEV_FC_HAS_TYPE("field-class", fc, "signed-enumeration", + BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class"); g_ptr_array_set_size(enum_fc->label_buf, 0); for (i = 0; i < enum_fc->mappings->len; i++) { @@ -630,18 +633,22 @@ end: static inline enum bt_field_class_enumeration_add_mapping_status add_mapping_to_enumeration_field_class(struct bt_field_class *fc, - const char *label, const struct bt_integer_range_set *range_set) + const char *label, const struct bt_integer_range_set *range_set, + const char *api_func) { enum bt_field_class_enumeration_add_mapping_status status = BT_FUNC_STATUS_OK; struct bt_field_class_enumeration *enum_fc = (void *) fc; struct bt_field_class_enumeration_mapping mapping = { 0 }; + BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func); BT_ASSERT(fc); - BT_ASSERT_PRE_NON_NULL(label, "Label"); - BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set"); - BT_ASSERT_PRE(!enumeration_field_class_has_mapping_with_label( - enum_fc, label), + BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "label", label, "Label"); + BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL_FROM_FUNC(api_func, range_set); + BT_ASSERT_PRE_FROM_FUNC(api_func, + "enumeration-field-class-mapping-label-is-unique", + !enumeration_field_class_has_mapping_with_label( + enum_fc, label), "Duplicate mapping name in enumeration field class: " "%![enum-fc-]+F, label=\"%s\"", fc, label); mapping.range_set = range_set; @@ -666,11 +673,13 @@ 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_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "unsigned-enumeration-field-class", + BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION, "Field class"); return add_mapping_to_enumeration_field_class(fc, label, - (const void *) range_set); + (const void *) range_set, __func__); } enum bt_field_class_enumeration_add_mapping_status @@ -678,11 +687,13 @@ 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_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, - "Field class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "signed-enumeration-field-class", + BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION, "Field class"); return add_mapping_to_enumeration_field_class(fc, label, - (const void *) range_set); + (const void *) range_set, __func__); } static @@ -694,20 +705,22 @@ void destroy_real_field_class(struct bt_object *obj) g_free(obj); } -struct bt_field_class *bt_field_class_real_create(bt_trace_class *trace_class) +static +struct bt_field_class *create_real_field_class(bt_trace_class *trace_class, + enum bt_field_class_type type) { struct bt_field_class_real *real_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); - BT_LOGD_STR("Creating default real field class object."); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); + BT_LOGD("Creating default real field class object: type=%s", + bt_common_field_class_type_string(type)); real_fc = g_new0(struct bt_field_class_real, 1); if (!real_fc) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate one real field class."); goto error; } - if (init_field_class((void *) real_fc, BT_FIELD_CLASS_TYPE_REAL, - destroy_real_field_class)) { + if (init_field_class((void *) real_fc, type, destroy_real_field_class)) { goto error; } @@ -721,26 +734,22 @@ end: return (void *) real_fc; } -bt_bool bt_field_class_real_is_single_precision(const struct bt_field_class *fc) +struct bt_field_class *bt_field_class_real_single_precision_create( + bt_trace_class *trace_class) { - const struct bt_field_class_real *real_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_REAL, "Field class"); - return real_fc->is_single_precision; + return create_real_field_class(trace_class, + BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL); } -void bt_field_class_real_set_is_single_precision(struct bt_field_class *fc, - bt_bool is_single_precision) +struct bt_field_class *bt_field_class_real_double_precision_create( + bt_trace_class *trace_class) { - struct bt_field_class_real *real_fc = (void *) fc; + BT_ASSERT_PRE_NO_ERROR(); - BT_ASSERT_PRE_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_REAL, "Field class"); - BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); - real_fc->is_single_precision = (bool) is_single_precision; - BT_LIB_LOGD("Set real field class's \"is single precision\" property: " - "%!+F", fc); + return create_real_field_class(trace_class, + BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL); } static @@ -799,18 +808,17 @@ void destroy_named_field_class(gpointer ptr) { struct bt_named_field_class *named_fc = ptr; - BT_OBJECT_PUT_REF_AND_RESET(named_fc->user_attributes); - if (ptr) { + BT_OBJECT_PUT_REF_AND_RESET(named_fc->user_attributes); finalize_named_field_class(ptr); g_free(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); @@ -853,7 +861,8 @@ struct bt_field_class *bt_field_class_structure_create( int ret; struct bt_field_class_structure *struct_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); BT_LOGD_STR("Creating default structure field class object."); struct_fc = g_new0(struct bt_field_class_structure, 1); if (!struct_fc) { @@ -905,7 +914,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; @@ -940,13 +949,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); @@ -961,12 +970,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: @@ -976,13 +985,15 @@ end: static int append_named_field_class_to_container_field_class( struct bt_field_class_named_field_class_container *container_fc, - struct bt_named_field_class *named_fc) + struct bt_named_field_class *named_fc, const char *api_func, + const char *unique_entry_precond_id) { BT_ASSERT(container_fc); BT_ASSERT(named_fc); - BT_ASSERT_PRE_DEV_FC_HOT(container_fc, "Field class"); - BT_ASSERT_PRE(!bt_g_hash_table_contains(container_fc->name_to_index, - named_fc->name->str), + BT_ASSERT_PRE_DEV_FC_HOT_FROM_FUNC(api_func, container_fc); + BT_ASSERT_PRE_FROM_FUNC(api_func, unique_entry_precond_id, + !bt_g_hash_table_contains(container_fc->name_to_index, + named_fc->name->str), "Duplicate member/option name in structure/variant field class: " "%![container-fc-]+F, name=\"%s\"", container_fc, named_fc->name->str); @@ -1007,9 +1018,9 @@ 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_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); named_fc = create_named_field_class(name, member_fc); if (!named_fc) { /* create_named_field_class() logs errors */ @@ -1018,7 +1029,8 @@ bt_field_class_structure_append_member( } status = append_named_field_class_to_container_field_class((void *) fc, - named_fc); + named_fc, __func__, + "structure-field-class-member-name-is-unique"); if (status == BT_FUNC_STATUS_OK) { /* Moved to the container */ named_fc = NULL; @@ -1033,9 +1045,8 @@ uint64_t bt_field_class_structure_get_member_count( { struct bt_field_class_structure *struct_fc = (void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); return (uint64_t) struct_fc->common.named_fcs->len; } @@ -1043,10 +1054,11 @@ static struct bt_named_field_class * borrow_named_field_class_from_container_field_class_at_index( struct bt_field_class_named_field_class_container *fc, - uint64_t index) + uint64_t index, const char *api_func) { - BT_ASSERT(fc); - BT_ASSERT_PRE_DEV_VALID_INDEX(index, fc->named_fcs->len); + BT_ASSERT_DBG(fc); + BT_ASSERT_PRE_DEV_VALID_INDEX_FROM_FUNC(api_func, index, + fc->named_fcs->len); return fc->named_fcs->pdata[index]; } @@ -1054,38 +1066,36 @@ const struct bt_field_class_structure_member * bt_field_class_structure_borrow_member_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_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( - (void *) fc, index); + (void *) fc, index, __func__); } struct bt_field_class_structure_member * bt_field_class_structure_borrow_member_by_index( 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_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_at_index( - (void *) fc, index); + (void *) fc, index, __func__); } static struct bt_named_field_class * borrow_named_field_class_from_container_field_class_by_name( struct bt_field_class_named_field_class_container *fc, - const char *name) + const char *name, const char *api_func) { struct bt_named_field_class *named_fc = NULL; gpointer orig_key; gpointer value; - BT_ASSERT(fc); - BT_ASSERT_PRE_DEV_NON_NULL(name, "Name"); + BT_ASSERT_DBG(fc); + BT_ASSERT_PRE_DEV_NAME_NON_NULL_FROM_FUNC(api_func, name); if (!g_hash_table_lookup_extended(fc->name_to_index, name, &orig_key, &value)) { goto end; @@ -1101,24 +1111,22 @@ const struct bt_field_class_structure_member * bt_field_class_structure_borrow_member_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_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( - (void *) fc, name); + (void *) fc, name, __func__); } struct bt_field_class_structure_member * bt_field_class_structure_borrow_member_by_name( 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_STRUCTURE, - "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_STRUCT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_by_name( - (void *) fc, name); + (void *) fc, name, __func__); } const char *bt_field_class_structure_member_get_name( @@ -1126,7 +1134,7 @@ const char *bt_field_class_structure_member_get_name( { const struct bt_named_field_class *named_fc = (const void *) member; - BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member"); + BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member); return named_fc->name->str; } @@ -1136,7 +1144,17 @@ bt_field_class_structure_member_borrow_field_class_const( { const struct bt_named_field_class *named_fc = (const void *) member; - BT_ASSERT_PRE_DEV_NON_NULL(member, "Structure field class member"); + BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member); + return named_fc->fc; +} + +struct bt_field_class * +bt_field_class_structure_member_borrow_field_class( + struct bt_field_class_structure_member *member) +{ + struct bt_named_field_class *named_fc = (void *) member; + + BT_ASSERT_PRE_DEV_STRUCT_FC_MEMBER_NON_NULL(member); return named_fc->fc; } @@ -1150,43 +1168,99 @@ void destroy_option_field_class(struct bt_object *obj) finalize_field_class((void *) obj); BT_LOGD_STR("Putting content field class."); BT_OBJECT_PUT_REF_AND_RESET(fc->content_fc); - BT_LOGD_STR("Putting selector field path."); - BT_OBJECT_PUT_REF_AND_RESET(fc->selector_field_path); - BT_LOGD_STR("Putting selector field class."); - BT_OBJECT_PUT_REF_AND_RESET(fc->selector_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."); + BT_OBJECT_PUT_REF_AND_RESET(with_sel_fc->selector_field_path); + 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_FIELD) { + struct bt_field_class_option_with_selector_field_integer *with_int_sel_fc = + (void *) obj; + + BT_LOGD_STR("Putting integer range set."); + BT_OBJECT_PUT_REF_AND_RESET(with_int_sel_fc->range_set); + } + } + g_free(fc); } -struct bt_field_class *bt_field_class_option_create(bt_trace_class *trace_class, - bt_field_class *content_fc, bt_field_class *selector_fc) +static +struct bt_field_class *create_option_field_class( + struct bt_trace_class *trace_class, + enum bt_field_class_type fc_type, + struct bt_field_class *content_fc, + struct bt_field_class *selector_fc, + const char *api_func) { struct bt_field_class_option *opt_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); - BT_ASSERT_PRE_NON_NULL(content_fc, "Content field class"); + BT_ASSERT_PRE_NO_ERROR_FROM_FUNC(api_func); + BT_ASSERT_PRE_TC_NON_NULL_FROM_FUNC(api_func, trace_class); + BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "content-field-class", + content_fc, "Content field class"); BT_LIB_LOGD("Creating option field class: " - "%![content-fc-]+F, %![sel-fc-]+F", content_fc, selector_fc); - opt_fc = g_new0(struct bt_field_class_option, 1); - if (!opt_fc) { - BT_LIB_LOGE_APPEND_CAUSE( - "Failed to allocate one option field class."); - goto error; + "type=%s, %![content-fc-]+F, %![sel-fc-]+F", + bt_common_field_class_type_string(fc_type), + content_fc, selector_fc); + + 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_FROM_FUNC(api_func, + "selector-field-class", selector_fc, + "Selector field class"); + + if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) { + BT_ASSERT_PRE_FC_HAS_TYPE_FROM_FUNC(api_func, + "selector-field-class", selector_fc, + "boolean-field-class", BT_FIELD_CLASS_TYPE_BOOL, + "Selector field class"); + opt_with_sel_fc = (void *) g_new0( + struct bt_field_class_option_with_selector_field_bool, 1); + } else { + BT_ASSERT_PRE_FC_IS_INT_FROM_FUNC(api_func, + "selector-field-class", + selector_fc, "Selector field class"); + opt_with_sel_fc = (void *) g_new0( + struct bt_field_class_option_with_selector_field_integer, 1); + } + + if (!opt_with_sel_fc) { + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one option with selector field class."); + goto error; + } + + opt_with_sel_fc->selector_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); + if (!opt_fc) { + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one option field class."); + goto error; + } } - if (init_field_class((void *) opt_fc, BT_FIELD_CLASS_TYPE_OPTION, + BT_ASSERT(opt_fc); + + if (init_field_class((void *) opt_fc, fc_type, destroy_option_field_class)) { goto error; } 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) { - BT_ASSERT_PRE_FC_HAS_ID(selector_fc, BT_FIELD_CLASS_TYPE_BOOL, - "Selector field class"); - opt_fc->selector_fc = selector_fc; - bt_object_get_no_null_check(opt_fc->selector_fc); bt_field_class_freeze(selector_fc); } @@ -1201,29 +1275,172 @@ end: return (void *) opt_fc; } +struct bt_field_class *bt_field_class_option_without_selector_create( + struct bt_trace_class *trace_class, + struct bt_field_class *content_fc) +{ + return create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD, + content_fc, NULL, __func__); +} + +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) +{ + BT_ASSERT_PRE_NO_ERROR(); + + return create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, + content_fc, selector_fc, __func__); +} + +struct bt_field_class * +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_field_integer *fc; + const struct bt_integer_range_set *range_set = + (const void *) u_range_set; + + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set); + BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY(range_set); + fc = (void *) create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, + content_fc, selector_fc, __func__); + + if (!fc) { + goto end; + } + + fc->range_set = range_set; + bt_object_get_ref_no_null_check(fc->range_set); + bt_integer_range_set_freeze(range_set); + +end: + return (void *) fc; +} + +struct bt_field_class * +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_field_integer *fc; + const struct bt_integer_range_set *range_set = + (const void *) i_range_set; + + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL(range_set); + BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY(range_set); + fc = (void *) create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD, + content_fc, selector_fc, __func__); + + if (!fc) { + goto end; + } + + fc->range_set = range_set; + bt_object_get_ref_no_null_check(fc->range_set); + bt_integer_range_set_freeze(range_set); + +end: + return (void *) fc; +} + const struct bt_field_class *bt_field_class_option_borrow_field_class_const( const struct bt_field_class *fc) { struct bt_field_class_option *opt_fc = (void *) fc; - BT_ASSERT_PRE_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_OPTION, - "Field class"); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_OPTION("field-class", fc, "Field class"); + return opt_fc->content_fc; +} + +struct bt_field_class *bt_field_class_option_borrow_field_class( + struct bt_field_class *fc) +{ + struct bt_field_class_option *opt_fc = (void *) fc; + + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_OPTION("field-class", fc, "Field class"); return opt_fc->content_fc; } const struct bt_field_path * -bt_field_class_option_borrow_selector_field_path_const( +bt_field_class_option_with_selector_field_borrow_selector_field_path_const( const struct bt_field_class *fc) { - struct bt_field_class_option *opt_fc = (void *) fc; + const struct bt_field_class_option_with_selector_field *opt_fc = + (const void *) fc; - BT_ASSERT_PRE_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_OPTION, - "Field class"); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_SEL("field-class", fc, "Field class"); return opt_fc->selector_field_path; } +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_field_bool *opt_fc = (void *) fc; + + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "option-field-class-with-boolean-selector-field", + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, + "Field class"); + BT_ASSERT_PRE_DEV_FC_HOT(fc); + opt_fc->sel_is_reversed = sel_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_field_bool *opt_fc = (void *) fc; + + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "option-field-class-with-boolean-selector-field", + 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_field_integer_unsigned_borrow_selector_ranges_const( + const struct bt_field_class *fc) +{ + struct bt_field_class_option_with_selector_field_integer *opt_fc = + (void *) fc; + + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL("field-class", fc, + "Field class"); + return (const void *) opt_fc->range_set; +} + +const struct bt_integer_range_set_signed * +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_field_integer *opt_fc = + (void *) fc; + + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL("field-class", fc, + "Field class"); + return (const void *) opt_fc->range_set; +} + static void finalize_variant_field_class(struct bt_field_class_variant *var_fc) { @@ -1244,9 +1461,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); @@ -1262,13 +1479,15 @@ 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_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); if (selector_fc) { - BT_ASSERT_PRE_FC_IS_INT(selector_fc, "Selector field class"); + BT_ASSERT_PRE_FC_IS_INT("selector-field-class", selector_fc, + "Selector field class"); } BT_LIB_LOGD("Creating default variant field class: %![sel-fc-]+F", @@ -1276,33 +1495,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) { @@ -1312,26 +1533,30 @@ 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; } +#define VAR_FC_OPT_NAME_IS_UNIQUE_ID \ + "variant-field-class-option-name-is-unique" + enum bt_field_class_variant_without_selector_append_option_status bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc) @@ -1339,11 +1564,15 @@ 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_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_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_NAME_NON_NULL(name); + BT_ASSERT_PRE_NON_NULL("option-field-class", option_fc, + "Option field class"); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-without-selector-field", + 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 */ @@ -1352,7 +1581,7 @@ bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc, } status = append_named_field_class_to_container_field_class((void *) fc, - named_fc); + named_fc, __func__, VAR_FC_OPT_NAME_IS_UNIQUE_ID); if (status == BT_FUNC_STATUS_OK) { /* Moved to the container */ named_fc = NULL; @@ -1394,7 +1623,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; @@ -1452,44 +1681,45 @@ 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) + enum bt_field_class_type expected_type, + const char *api_func) { 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"); - BT_ASSERT_PRE_NON_NULL(name, "Name"); - BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class"); - BT_ASSERT_PRE_NON_NULL(range_set, "Integer range set"); - BT_ASSERT_PRE_FC_HAS_ID(fc, expected_type, "Field class"); - BT_ASSERT_PRE(range_set->ranges->len > 0, - "Integer range set is empty: %!+R", range_set); + BT_ASSERT(fc); + BT_ASSERT_PRE_NAME_NON_NULL_FROM_FUNC(api_func, name); + BT_ASSERT_PRE_NON_NULL_FROM_FUNC(api_func, "option-field-class", + option_fc, "Option field class"); + BT_ASSERT_PRE_INT_RANGE_SET_NON_NULL_FROM_FUNC(api_func, range_set); + BT_ASSERT_PRE_INT_RANGE_SET_NOT_EMPTY_FROM_FUNC(api_func, 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 */ goto end; } - BT_ASSERT_PRE(!has_overlap, + BT_ASSERT_PRE_FROM_FUNC(api_func, "ranges-do-not-overlap", + !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; } status = append_named_field_class_to_container_field_class((void *) fc, - &opt->common); + &opt->common, __func__, VAR_FC_OPT_NAME_IS_UNIQUE_ID); if (status == BT_FUNC_STATUS_OK) { /* Moved to the container */ opt = NULL; @@ -1497,40 +1727,54 @@ 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(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-unsigned-integer-selector-field", + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, + "Field class"); + 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, + __func__); } -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(); + BT_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-signed-integer-selector-field", + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, + "Field class"); + 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, + __func__); } uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc) { const struct bt_field_class_variant *var_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class"); return (uint64_t) var_fc->common.named_fcs->len; } @@ -1538,96 +1782,100 @@ const struct bt_field_class_variant_option * bt_field_class_variant_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_IS_VARIANT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( - (void *) fc, name); + (void *) fc, name, __func__); } const struct bt_field_class_variant_option * bt_field_class_variant_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_IS_VARIANT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( - (void *) fc, index); + (void *) fc, index, __func__); } struct bt_field_class_variant_option * bt_field_class_variant_borrow_option_by_name( struct bt_field_class *fc, const char *name) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_by_name( - (void *) fc, name); + (void *) fc, name, __func__); } struct bt_field_class_variant_option * bt_field_class_variant_borrow_option_by_index( struct bt_field_class *fc, uint64_t index) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_VARIANT(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT("field-class", fc, "Field class"); return (void *) borrow_named_field_class_from_container_field_class_at_index( - (void *) fc, index); + (void *) fc, index, __func__); } -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_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-unsigned-integer-selector-field", + 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); + (void *) fc, name, __func__); } -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_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-unsigned-integer-selector-field", + 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); + (void *) fc, index, __func__); } -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_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-signed-integer-selector-field", + 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); + (void *) fc, name, __func__); } -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_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "variant-field-class-with-signed-integer-selector-field", + 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( - (void *) fc, index); + (void *) fc, index, __func__); } const char *bt_field_class_variant_option_get_name( @@ -1635,7 +1883,7 @@ const char *bt_field_class_variant_option_get_name( { const struct bt_named_field_class *named_fc = (const void *) option; - BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option"); + BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option); return named_fc->name->str; } @@ -1645,41 +1893,52 @@ bt_field_class_variant_option_borrow_field_class_const( { const struct bt_named_field_class *named_fc = (const void *) option; - BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option"); + BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option); + return named_fc->fc; +} + +struct bt_field_class * +bt_field_class_variant_option_borrow_field_class( + struct bt_field_class_variant_option *option) +{ + struct bt_named_field_class *named_fc = (void *) option; + + BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option); return named_fc->fc; } 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"); + BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option); return (const void *) opt->range_set; } 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"); + BT_ASSERT_PRE_DEV_VAR_FC_OPT_NON_NULL(option); return (const void *) opt->range_set; } 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"); - BT_ASSERT_PRE_DEV_FC_IS_VARIANT_WITH_SEL(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_VARIANT_WITH_SEL("field-class", fc, + "Field class"); return var_fc->selector_field_path; } @@ -1697,7 +1956,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: @@ -1728,8 +1987,10 @@ bt_field_class_array_static_create(bt_trace_class *trace_class, { struct bt_field_class_array_static *array_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); - BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); + BT_ASSERT_PRE_NON_NULL("element-field-class", element_fc, + "Element field class"); BT_LOGD_STR("Creating default static array field class object."); array_fc = g_new0(struct bt_field_class_array_static, 1); if (!array_fc) { @@ -1761,8 +2022,8 @@ bt_field_class_array_borrow_element_field_class_const( { const struct bt_field_class_array *array_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_ARRAY("field-class", fc, "Field class"); return array_fc->element_fc; } @@ -1771,8 +2032,8 @@ bt_field_class_array_borrow_element_field_class(struct bt_field_class *fc) { struct bt_field_class_array *array_fc = (void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_IS_ARRAY(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_DEV_FC_IS_ARRAY("field-class", fc, "Field class"); return array_fc->element_fc; } @@ -1780,8 +2041,9 @@ uint64_t bt_field_class_array_static_get_length(const struct bt_field_class *fc) { const struct bt_field_class_array_static *array_fc = (const void *) fc; - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY, + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "static-array-field-class", BT_FIELD_CLASS_TYPE_STATIC_ARRAY, "Field class"); return (uint64_t) array_fc->length; } @@ -1808,8 +2070,10 @@ struct bt_field_class *bt_field_class_array_dynamic_create( { struct bt_field_class_array_dynamic *array_fc = NULL; - BT_ASSERT_PRE_NON_NULL(trace_class, "Trace class"); - BT_ASSERT_PRE_NON_NULL(element_fc, "Element field class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); + BT_ASSERT_PRE_NON_NULL("element-field-class", element_fc, + "Element field class"); BT_LOGD_STR("Creating default dynamic array field class object."); array_fc = g_new0(struct bt_field_class_array_dynamic, 1); if (!array_fc) { @@ -1819,16 +2083,18 @@ 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; } if (length_fc) { - BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc, - "Length field class"); + BT_ASSERT_PRE_FC_IS_UNSIGNED_INT("length-field-class", + 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); } @@ -1843,13 +2109,16 @@ 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_DEV_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); + BT_ASSERT_PRE_FC_HAS_TYPE("field-class", fc, + "dynamic-array-field-class-with-length-field", + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD, "Field class"); return seq_fc->length_field_path; } @@ -1867,7 +2136,8 @@ 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_NON_NULL(trace_class, "Trace class"); + BT_ASSERT_PRE_NO_ERROR(); + BT_ASSERT_PRE_TC_NON_NULL(trace_class); BT_LOGD_STR("Creating default string field class object."); string_fc = g_new0(struct bt_field_class_string, 1); if (!string_fc) { @@ -1904,12 +2174,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; @@ -1918,11 +2185,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; } } @@ -1943,16 +2205,14 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) struct bt_field_class *fc = (void *) c_fc; BT_ASSERT(fc); - BT_ASSERT_PRE(!fc->part_of_trace_class, - "Field class is already part of a trace: %!+F", fc); + BT_ASSERT_PRE("field-class-is-not-part-of-trace-class", + !fc->part_of_trace_class, + "Field class is already part of a trace class: %!+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; @@ -1963,26 +2223,18 @@ 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; } } const struct bt_value *bt_field_class_borrow_user_attributes_const( const struct bt_field_class *fc) { - BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_DEV_FC_NON_NULL(fc); return fc->user_attributes; } @@ -1998,14 +2250,13 @@ void bt_field_class_set_user_attributes( struct bt_field_class *fc, const struct bt_value *user_attributes) { - BT_ASSERT_PRE_NON_NULL(fc, "Field class"); - BT_ASSERT_PRE_NON_NULL(user_attributes, "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_ASSERT_PRE_FC_NON_NULL(fc); + BT_ASSERT_PRE_USER_ATTRS_NON_NULL(user_attributes); + BT_ASSERT_PRE_USER_ATTRS_IS_MAP(user_attributes); + BT_ASSERT_PRE_DEV_FC_HOT(fc); + 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 @@ -2016,26 +2267,22 @@ const struct bt_value *bt_named_field_class_borrow_user_attributes_const( } static -void bt_named_field_class_set_user_attributes( +void set_named_field_class_user_attributes( struct bt_named_field_class *named_fc, - const struct bt_value *user_attributes) + const struct bt_value *user_attributes, const char *api_func) { - BT_ASSERT_PRE_NON_NULL(user_attributes, "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_HOT(named_fc, - "Structure field class member or variant field class option", - "."); - bt_object_put_no_null_check(named_fc->user_attributes); + BT_ASSERT_PRE_USER_ATTRS_NON_NULL_FROM_FUNC(api_func, user_attributes); + BT_ASSERT_PRE_USER_ATTRS_NON_NULL_FROM_FUNC(api_func, 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 * bt_field_class_structure_member_borrow_user_attributes_const( const struct bt_field_class_structure_member *member) { - BT_ASSERT_PRE_NON_NULL(member, "Structure field class member"); + BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member); return bt_named_field_class_borrow_user_attributes_const( (const void *) member); } @@ -2044,7 +2291,7 @@ struct bt_value * bt_field_class_structure_member_borrow_user_attributes( struct bt_field_class_structure_member *member) { - BT_ASSERT_PRE_NON_NULL(member, "Structure field class member"); + BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member); return (void *) bt_named_field_class_borrow_user_attributes_const( (void *) member); } @@ -2053,15 +2300,18 @@ void bt_field_class_structure_member_set_user_attributes( struct bt_field_class_structure_member *member, const struct bt_value *user_attributes) { - BT_ASSERT_PRE_NON_NULL(member, "Structure field class member"); - bt_named_field_class_set_user_attributes((void *) member, - user_attributes); + BT_ASSERT_PRE_STRUCT_FC_MEMBER_NON_NULL(member); + BT_ASSERT_PRE_DEV_HOT("structure-field-class-member", + (struct bt_named_field_class *) member, + "Structure field class member", "."); + set_named_field_class_user_attributes((void *) member, + user_attributes, __func__); } const struct bt_value *bt_field_class_variant_option_borrow_user_attributes_const( const struct bt_field_class_variant_option *option) { - BT_ASSERT_PRE_NON_NULL(option, "Variant field class option"); + BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option); return bt_named_field_class_borrow_user_attributes_const( (const void *) option); } @@ -2069,7 +2319,7 @@ const struct bt_value *bt_field_class_variant_option_borrow_user_attributes_cons struct bt_value *bt_field_class_variant_option_borrow_user_attributes( struct bt_field_class_variant_option *option) { - BT_ASSERT_PRE_NON_NULL(option, "Variant field class option"); + BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option); return (void *) bt_named_field_class_borrow_user_attributes_const( (void *) option); } @@ -2078,9 +2328,12 @@ void bt_field_class_variant_option_set_user_attributes( struct bt_field_class_variant_option *option, const struct bt_value *user_attributes) { - BT_ASSERT_PRE_NON_NULL(option, "Variant field class option"); - bt_named_field_class_set_user_attributes((void *) option, - user_attributes); + BT_ASSERT_PRE_VAR_FC_OPT_NON_NULL(option); + BT_ASSERT_PRE_DEV_HOT("variant-field-class-option", + (struct bt_named_field_class *) option, + "Variant field class option", "."); + set_named_field_class_user_attributes((void *) option, + user_attributes, __func__); } void bt_field_class_get_ref(const struct bt_field_class *field_class)