X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-class.c;h=25d5b7e718e964daa73134d00a5ad0a7f8c13bd0;hb=81b8fa4490092c27f40470f1f50a925f768b7b83;hp=6afc32b82acbb2a57ddbec6e257a7f8a9166c18e;hpb=5cebbe7fc898bb1d887cbdac1f4dd5f0042443fd;p=babeltrace.git diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c index 6afc32b8..25d5b7e7 100644 --- a/src/lib/trace-ir/field-class.c +++ b/src/lib/trace-ir/field-class.c @@ -46,6 +46,7 @@ #include "utils.h" #include "lib/func-status.h" #include "lib/integer-range-set.h" +#include "lib/value.h" enum bt_field_class_type bt_field_class_get_type( const struct bt_field_class *fc) @@ -55,13 +56,83 @@ enum bt_field_class_type bt_field_class_get_type( } static -void init_field_class(struct bt_field_class *fc, enum bt_field_class_type type, +int init_field_class(struct bt_field_class *fc, enum bt_field_class_type type, bt_object_release_func release_func) { + int ret = 0; + BT_ASSERT(fc); BT_ASSERT(release_func); bt_object_init_shared(&fc->base, release_func); fc->type = type; + fc->user_attributes = bt_value_map_create(); + if (!fc->user_attributes) { + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to create a map value object."); + ret = -1; + goto end; + } + +end: + return ret; +} + +static +void finalize_field_class(struct bt_field_class *fc) +{ + BT_OBJECT_PUT_REF_AND_RESET(fc->user_attributes); +} + +static +void destroy_bit_array_field_class(struct bt_object *obj) +{ + BT_ASSERT(obj); + BT_LIB_LOGD("Destroying bit array field class object: %!+F", obj); + finalize_field_class((void *) obj); + g_free(obj); +} + +struct bt_field_class *bt_field_class_bit_array_create( + struct bt_trace_class *trace_class, uint64_t length) +{ + 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, + "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."); + ba_fc = g_new0(struct bt_field_class_bit_array, 1); + if (!ba_fc) { + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to allocate one bit array field class."); + goto error; + } + + if (init_field_class((void *) ba_fc, BT_FIELD_CLASS_TYPE_BIT_ARRAY, + destroy_bit_array_field_class)) { + goto error; + } + + ba_fc->length = length; + BT_LIB_LOGD("Created bit array field class object: %!+F", ba_fc); + goto end; + +error: + BT_OBJECT_PUT_REF_AND_RESET(ba_fc); + +end: + return (void *) ba_fc; +} + +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"); + return ba_fc->length; } static @@ -69,6 +140,7 @@ void destroy_bool_field_class(struct bt_object *obj) { BT_ASSERT(obj); BT_LIB_LOGD("Destroying boolean field class object: %!+F", obj); + finalize_field_class((void *) obj); g_free(obj); } @@ -86,8 +158,11 @@ struct bt_field_class *bt_field_class_bool_create( goto error; } - init_field_class((void *) bool_fc, BT_FIELD_CLASS_TYPE_BOOL, - destroy_bool_field_class); + if (init_field_class((void *) bool_fc, BT_FIELD_CLASS_TYPE_BOOL, + destroy_bool_field_class)) { + goto error; + } + BT_LIB_LOGD("Created boolean field class object: %!+F", bool_fc); goto end; @@ -99,13 +174,22 @@ end: } static -void init_integer_field_class(struct bt_field_class_integer *fc, +int init_integer_field_class(struct bt_field_class_integer *fc, enum bt_field_class_type type, bt_object_release_func release_func) { - init_field_class((void *) fc, type, release_func); + int ret; + + ret = init_field_class((void *) fc, type, release_func); + if (ret) { + goto end; + } + fc->range = 64; fc->base = BT_FIELD_CLASS_INTEGER_PREFERRED_DISPLAY_BASE_DECIMAL; + +end: + return ret; } static @@ -113,6 +197,7 @@ void destroy_integer_field_class(struct bt_object *obj) { BT_ASSERT(obj); BT_LIB_LOGD("Destroying integer field class object: %!+F", obj); + finalize_field_class((void *) obj); g_free(obj); } @@ -132,7 +217,11 @@ struct bt_field_class *create_integer_field_class(bt_trace_class *trace_class, goto error; } - init_integer_field_class(int_fc, type, destroy_integer_field_class); + if (init_integer_field_class(int_fc, type, + destroy_integer_field_class)) { + goto error; + } + BT_LIB_LOGD("Created integer field class object: %!+F", int_fc); goto end; @@ -241,6 +330,7 @@ void destroy_enumeration_field_class(struct bt_object *obj) BT_ASSERT(fc); BT_LIB_LOGD("Destroying enumeration field class object: %!+F", fc); + finalize_field_class((void *) obj); if (fc->mappings) { uint64_t i; @@ -278,8 +368,11 @@ struct bt_field_class *create_enumeration_field_class( goto error; } - init_integer_field_class((void *) enum_fc, type, - destroy_enumeration_field_class); + if (init_integer_field_class((void *) enum_fc, type, + destroy_enumeration_field_class)) { + goto error; + } + enum_fc->mappings = g_array_new(FALSE, TRUE, sizeof(struct bt_field_class_enumeration_mapping)); if (!enum_fc->mappings) { @@ -597,23 +690,29 @@ void destroy_real_field_class(struct bt_object *obj) { BT_ASSERT(obj); BT_LIB_LOGD("Destroying real field class object: %!+F", obj); + finalize_field_class((void *) 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_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; } - 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; + } + BT_LIB_LOGD("Created real field class object: %!+F", real_fc); goto end; @@ -624,26 +723,18 @@ 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_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_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 @@ -655,7 +746,11 @@ int init_named_field_classes_container( { int ret = 0; - init_field_class((void *) fc, type, fc_release_func); + ret = init_field_class((void *) fc, type, fc_release_func); + if (ret) { + goto end; + } + fc->named_fcs = g_ptr_array_new_with_free_func(named_fc_destroy_func); if (!fc->named_fcs) { BT_LIB_LOGE_APPEND_CAUSE("Failed to allocate a GPtrArray."); @@ -682,6 +777,7 @@ void finalize_named_field_class(struct bt_named_field_class *named_fc) "addr=%p, name=\"%s\", %![fc-]+F", named_fc, named_fc->name ? named_fc->name->str : NULL, named_fc->fc); + BT_OBJECT_PUT_REF_AND_RESET(named_fc->user_attributes); if (named_fc->name) { g_string_free(named_fc->name, TRUE); @@ -695,7 +791,10 @@ void finalize_named_field_class(struct bt_named_field_class *named_fc) static void destroy_named_field_class(gpointer ptr) { + struct bt_named_field_class *named_fc = ptr; + if (ptr) { + BT_OBJECT_PUT_REF_AND_RESET(named_fc->user_attributes); finalize_named_field_class(ptr); g_free(ptr); } @@ -736,6 +835,7 @@ void destroy_structure_field_class(struct bt_object *obj) { BT_ASSERT(obj); BT_LIB_LOGD("Destroying structure field class object: %!+F", obj); + finalize_field_class((void *) obj); finalize_named_field_classes_container((void *) obj); g_free(obj); } @@ -789,9 +889,16 @@ int init_named_field_class(struct bt_named_field_class *named_fc, goto end; } + named_fc->user_attributes = bt_value_map_create(); + if (!named_fc->user_attributes) { + BT_LIB_LOGE_APPEND_CAUSE( + "Failed to create a map value object."); + status = BT_FUNC_STATUS_MEMORY_ERROR; + goto end; + } + named_fc->fc = fc; - bt_object_get_no_null_check(named_fc->fc); - bt_named_field_class_freeze(named_fc); + bt_object_get_ref_no_null_check(named_fc->fc); end: return status; @@ -847,7 +954,7 @@ 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; @@ -872,6 +979,13 @@ int append_named_field_class_to_container_field_class( "Duplicate member/option name in structure/variant field class: " "%![container-fc-]+F, name=\"%s\"", container_fc, named_fc->name->str); + + /* + * Freeze the contained field class, but not the named field + * class itself, as it's still possible afterwards to modify + * properties of the member/option object. + */ + bt_field_class_freeze(named_fc->fc); g_ptr_array_add(container_fc->named_fcs, named_fc); g_hash_table_insert(container_fc->name_to_index, named_fc->name->str, GUINT_TO_POINTER(container_fc->named_fcs->len - 1)); @@ -1019,11 +1133,298 @@ bt_field_class_structure_member_borrow_field_class_const( 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_NON_NULL(member, "Structure field class member"); + return named_fc->fc; +} + +static +void destroy_option_field_class(struct bt_object *obj) +{ + struct bt_field_class_option *fc = (void *) obj; + + BT_ASSERT(fc); + BT_LIB_LOGD("Destroying option field class object: %!+F", fc); + finalize_field_class((void *) 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 = + (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) { + struct bt_field_class_option_with_selector_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); +} + +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) +{ + 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_LIB_LOGD("Creating option field class: " + "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) { + struct bt_field_class_option_with_selector *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) { + 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); + } 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); + } + + 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; + } + } + + 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_ref_no_null_check(opt_fc->content_fc); + bt_field_class_freeze(opt_fc->content_fc); + + if (selector_fc) { + bt_field_class_freeze(selector_fc); + } + + BT_LIB_LOGD("Created option field class object: " + "%![opt-fc-]+F, %![sel-fc-]+F", opt_fc, selector_fc); + goto end; + +error: + BT_OBJECT_PUT_REF_AND_RESET(opt_fc); + +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, + content_fc, NULL); +} + +struct bt_field_class *bt_field_class_option_with_selector_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; + } + +end: + return (void *) fc; +} + +struct bt_field_class * +bt_field_class_option_with_selector_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; + const struct bt_integer_range_set *range_set = + (const void *) u_range_set; + + 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, + content_fc, selector_fc); + + 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_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; + const struct bt_integer_range_set *range_set = + (const void *) i_range_set; + + 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, + content_fc, selector_fc); + + 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_FC_IS_OPTION(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_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_IS_OPTION(fc, "Field class"); + return opt_fc->content_fc; +} + +const struct bt_field_path * +bt_field_class_option_with_selector_borrow_selector_field_path_const( + const struct bt_field_class *fc) +{ + const struct bt_field_class_option_with_selector *opt_fc = + (const void *) fc; + + BT_ASSERT_PRE_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_SEL(fc, "Field class"); + return opt_fc->selector_field_path; +} + +void bt_field_class_option_with_selector_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; + + 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_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( + const struct bt_field_class *fc) +{ + struct bt_field_class_option_with_selector_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"); + 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( + const struct bt_field_class *fc) +{ + struct bt_field_class_option_with_selector_integer *opt_fc = + (void *) fc; + + BT_ASSERT_PRE_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class"); + return (const void *) opt_fc->range_set; +} + +const struct bt_integer_range_set_signed * +bt_field_class_option_with_selector_integer_signed_borrow_selector_ranges_const( + const struct bt_field_class *fc) +{ + struct bt_field_class_option_with_selector_integer *opt_fc = + (void *) fc; + + BT_ASSERT_PRE_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_IS_OPTION_WITH_INT_SEL(fc, "Field class"); + return (const void *) opt_fc->range_set; +} + static void finalize_variant_field_class(struct bt_field_class_variant *var_fc) { BT_ASSERT(var_fc); BT_LIB_LOGD("Finalizing variant field class object: %!+F", var_fc); + finalize_field_class((void *) var_fc); finalize_named_field_classes_container((void *) var_fc); } @@ -1079,9 +1480,9 @@ struct bt_field_class *bt_field_class_variant_create( 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; + fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR; } else { - fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR; + fc_type = BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR; } ret = init_named_field_classes_container( @@ -1094,9 +1495,11 @@ struct bt_field_class *bt_field_class_variant_create( } 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) { @@ -1112,15 +1515,16 @@ struct bt_field_class *bt_field_class_variant_create( /* 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; @@ -1265,7 +1669,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, &has_overlap); if (status) { /* ranges_overlap() logs errors */ @@ -1297,26 +1701,26 @@ end: 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_integer_append_option_status +bt_field_class_variant_with_selector_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, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR); } -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_integer_append_option_status +bt_field_class_variant_with_selector_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, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR); } uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc) @@ -1350,52 +1754,74 @@ bt_field_class_variant_borrow_option_by_index_const( (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( +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"); + return (void *) + borrow_named_field_class_from_container_field_class_by_name( + (void *) fc, name); +} + +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"); + return (void *) + borrow_named_field_class_from_container_field_class_at_index( + (void *) fc, index); +} + +const struct bt_field_class_variant_with_selector_integer_unsigned_option * +bt_field_class_variant_with_selector_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 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_integer_unsigned_option * +bt_field_class_variant_with_selector_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 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_integer_signed_option * +bt_field_class_variant_with_selector_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 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_integer_signed_option * +bt_field_class_variant_with_selector_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 class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( @@ -1421,9 +1847,19 @@ bt_field_class_variant_option_borrow_field_class_const( 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_NON_NULL(option, "Variant field class 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_integer_unsigned_option_borrow_ranges_const( + const struct bt_field_class_variant_with_selector_integer_unsigned_option *option) { const struct bt_field_class_variant_with_selector_option *opt = (const void *) option; @@ -1433,8 +1869,8 @@ 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_integer_signed_option_borrow_ranges_const( + const struct bt_field_class_variant_with_selector_integer_signed_option *option) { const struct bt_field_class_variant_with_selector_option *opt = (const void *) option; @@ -1456,15 +1892,24 @@ bt_field_class_variant_with_selector_borrow_selector_field_path_const( } static -void init_array_field_class(struct bt_field_class_array *fc, +int init_array_field_class(struct bt_field_class_array *fc, enum bt_field_class_type type, bt_object_release_func release_func, struct bt_field_class *element_fc) { + int ret; + BT_ASSERT(element_fc); - init_field_class((void *) fc, type, release_func); + ret = init_field_class((void *) fc, type, release_func); + if (ret) { + goto end; + } + 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: + return ret; } static @@ -1472,6 +1917,7 @@ void finalize_array_field_class(struct bt_field_class_array *array_fc) { BT_ASSERT(array_fc); BT_LOGD_STR("Putting element field class."); + finalize_field_class((void *) array_fc); BT_OBJECT_PUT_REF_AND_RESET(array_fc->element_fc); } @@ -1500,8 +1946,12 @@ bt_field_class_array_static_create(bt_trace_class *trace_class, goto error; } - init_array_field_class((void *) array_fc, BT_FIELD_CLASS_TYPE_STATIC_ARRAY, - destroy_static_array_field_class, element_fc); + if (init_array_field_class((void *) array_fc, + BT_FIELD_CLASS_TYPE_STATIC_ARRAY, + destroy_static_array_field_class, element_fc)) { + goto error; + } + array_fc->length = length; BT_LIB_LOGD("Created static array field class object: %!+F", array_fc); goto end; @@ -1576,15 +2026,19 @@ struct bt_field_class *bt_field_class_array_dynamic_create( goto error; } - init_array_field_class((void *) array_fc, - BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, - destroy_dynamic_array_field_class, element_fc); + if (init_array_field_class((void *) array_fc, + 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"); 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); } @@ -1599,13 +2053,14 @@ 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_DEV_FC_HAS_ID(fc, + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD, "Field class"); return seq_fc->length_field_path; } @@ -1615,6 +2070,7 @@ void destroy_string_field_class(struct bt_object *obj) { BT_ASSERT(obj); BT_LIB_LOGD("Destroying string field class object: %!+F", obj); + finalize_field_class((void *) obj); g_free(obj); } @@ -1631,8 +2087,11 @@ struct bt_field_class *bt_field_class_string_create(bt_trace_class *trace_class) goto error; } - init_field_class((void *) string_fc, BT_FIELD_CLASS_TYPE_STRING, - destroy_string_field_class); + if (init_field_class((void *) string_fc, BT_FIELD_CLASS_TYPE_STRING, + destroy_string_field_class)) { + goto error; + } + BT_LIB_LOGD("Created string field class object: %!+F", string_fc); goto end; @@ -1653,13 +2112,14 @@ void _bt_field_class_freeze(const struct bt_field_class *c_fc) * their owner. */ BT_ASSERT(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: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR: { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; @@ -1681,8 +2141,11 @@ BT_HIDDEN void _bt_named_field_class_freeze(const struct bt_named_field_class *named_fc) { BT_ASSERT(named_fc); + BT_ASSERT(named_fc->fc->frozen); + BT_LIB_LOGD("Freezing named field class's user attributes: %!+v", + named_fc->user_attributes); + bt_value_freeze(named_fc->user_attributes); ((struct bt_named_field_class *) named_fc)->frozen = true; - bt_field_class_freeze(named_fc->fc); } BT_HIDDEN @@ -1698,8 +2161,8 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) 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: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR: { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; @@ -1715,7 +2178,8 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) break; } case BT_FIELD_CLASS_TYPE_STATIC_ARRAY: - case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD: + case BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD: { struct bt_field_class_array *array_fc = (void *) fc; @@ -1727,6 +2191,110 @@ void bt_field_class_make_part_of_trace_class(const struct bt_field_class *c_fc) } } +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"); + return fc->user_attributes; +} + +struct bt_value *bt_field_class_borrow_user_attributes( + struct bt_field_class *field_class) +{ + return (void *) bt_field_class_borrow_user_attributes_const( + (void *) field_class); +} + + +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_ref_no_null_check(fc->user_attributes); + fc->user_attributes = (void *) user_attributes; + bt_object_get_ref_no_null_check(fc->user_attributes); +} + +static +const struct bt_value *bt_named_field_class_borrow_user_attributes_const( + const struct bt_named_field_class *named_fc) +{ + return named_fc->user_attributes; +} + +static +void bt_named_field_class_set_user_attributes( + struct bt_named_field_class *named_fc, + const struct bt_value *user_attributes) +{ + 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_ref_no_null_check(named_fc->user_attributes); + named_fc->user_attributes = (void *) 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"); + return bt_named_field_class_borrow_user_attributes_const( + (const void *) member); +} + +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"); + return (void *) bt_named_field_class_borrow_user_attributes_const( + (void *) member); +} + +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); +} + +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"); + return bt_named_field_class_borrow_user_attributes_const( + (const void *) option); +} + +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"); + return (void *) bt_named_field_class_borrow_user_attributes_const( + (void *) option); +} + +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); +} + void bt_field_class_get_ref(const struct bt_field_class *field_class) { bt_object_get_ref(field_class);