X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Flib%2Ftrace-ir%2Ffield-class.c;h=62c5afa9ad1cdd0e0ae10e221e23e1954122bcf1;hb=8bc207afcf9695b096a0a8e8405f06b6328f069b;hp=97409dc98222e21d68a673395a7b1d7d71dc8d5e;hpb=af90138b9544aabfb18354c251f8c8094099972d;p=babeltrace.git diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c index 97409dc9..62c5afa9 100644 --- a/src/lib/trace-ir/field-class.c +++ b/src/lib/trace-ir/field-class.c @@ -694,20 +694,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_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 +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 @@ -799,18 +793,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); @@ -905,7 +898,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 +933,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 +954,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: @@ -1140,6 +1133,16 @@ 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) { @@ -1150,43 +1153,92 @@ 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) { 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: " - "%![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(selector_fc, "Selector field class"); + + if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) { + BT_ASSERT_PRE_FC_HAS_ID(selector_fc, + BT_FIELD_CLASS_TYPE_BOOL, + "Selector field class"); + opt_with_sel_fc = (void *) g_new0( + struct bt_field_class_option_with_selector_field_bool, 1); + } else { + BT_ASSERT_PRE_FC_IS_INT(selector_fc, + "Selector field class"); + opt_with_sel_fc = (void *) g_new0( + struct bt_field_class_option_with_selector_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 +1253,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); +} + +struct bt_field_class *bt_field_class_option_with_selector_field_bool_create( + struct bt_trace_class *trace_class, + struct bt_field_class *content_fc, + struct bt_field_class *selector_fc) +{ + struct bt_field_class_option_with_selector_field_bool *fc = + (void *) create_option_field_class(trace_class, + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, + content_fc, selector_fc); + + if (!fc) { + goto end; + } + +end: + return (void *) fc; +} + +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_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_FIELD, + 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_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_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_FIELD, + 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_DEV_FC_HAS_ID(fc, BT_FIELD_CLASS_TYPE_OPTION, - "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_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_IS_OPTION_WITH_SEL(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_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_HAS_ID(fc, + BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD, "Field class"); + BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); + opt_fc->sel_is_reversed = sel_is_reversed; +} + +bt_bool bt_field_class_option_with_selector_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_NON_NULL(fc, "Field class"); + BT_ASSERT_PRE_FC_HAS_ID(fc, + 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_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_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_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) { @@ -1244,9 +1439,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,7 +1457,7 @@ 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"); @@ -1276,7 +1471,7 @@ 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."); @@ -1285,24 +1480,26 @@ 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_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,21 +1509,22 @@ struct bt_field_class *bt_field_class_variant_create( } ret = init_named_field_classes_container((void *) var_fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD, destroy_variant_field_class, destroy_named_field_class); if (ret) { /* init_named_field_classes_container() logs errors */ goto error; } + BT_LIB_LOGD("Created default variant field class without selector object: " + "%![var-fc-]+F", var_fc); } BT_ASSERT(var_fc); - BT_LIB_LOGD("Created default variant field class with selector object: " - "%![var-fc-]+F, %![sel-fc-]+F", var_fc, selector_fc); goto end; error: BT_OBJECT_PUT_REF_AND_RESET(var_fc); + BT_OBJECT_PUT_REF_AND_RESET(var_with_sel_fc); end: return (void *) var_fc; @@ -1343,7 +1541,7 @@ bt_field_class_variant_without_selector_append_option(struct bt_field_class *fc, BT_ASSERT_PRE_NON_NULL(name, "Name"); BT_ASSERT_PRE_NON_NULL(option_fc, "Option field class"); BT_ASSERT_PRE_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR, "Field class"); + BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD, "Field class"); named_fc = create_named_field_class(name, option_fc); if (!named_fc) { /* create_named_field_class() logs errors */ @@ -1394,7 +1592,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,15 +1650,15 @@ end: } static -int append_option_to_variant_with_selector_field_class( +int append_option_to_variant_with_selector_field_field_class( struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc, const struct bt_integer_range_set *range_set, enum bt_field_class_type expected_type) { int status; - struct bt_field_class_variant_with_selector *var_fc = (void *) fc; - struct bt_field_class_variant_with_selector_option *opt = NULL; + struct bt_field_class_variant_with_selector_field *var_fc = (void *) fc; + struct bt_field_class_variant_with_selector_field_option *opt = NULL; bool has_overlap; BT_ASSERT_PRE_NON_NULL(fc, "Field class"); @@ -1471,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_FIELD, &has_overlap); if (status) { /* ranges_overlap() logs errors */ @@ -1481,9 +1679,9 @@ int append_option_to_variant_with_selector_field_class( BT_ASSERT_PRE(!has_overlap, "Integer range set's ranges and existing ranges have an overlap: " "%!+R", range_set); - opt = create_variant_with_selector_option(name, option_fc, range_set); + opt = create_variant_with_selector_field_option(name, option_fc, range_set); if (!opt) { - /* create_variant_with_selector_option() logs errors */ + /* create_variant_with_selector_field_option() logs errors */ status = BT_FUNC_STATUS_MEMORY_ERROR; goto end; } @@ -1497,32 +1695,32 @@ 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, + return append_option_to_variant_with_selector_field_field_class(fc, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD); } -enum bt_field_class_variant_with_selector_append_option_status -bt_field_class_variant_with_selector_signed_append_option( +enum bt_field_class_variant_with_selector_field_integer_append_option_status +bt_field_class_variant_with_selector_field_integer_signed_append_option( struct bt_field_class *fc, const char *name, struct bt_field_class *option_fc, const struct bt_integer_range_set_signed *range_set) { - return append_option_to_variant_with_selector_field_class(fc, + return append_option_to_variant_with_selector_field_field_class(fc, name, option_fc, (const void *) range_set, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR); + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD); } uint64_t bt_field_class_variant_get_option_count(const struct bt_field_class *fc) @@ -1578,52 +1776,52 @@ bt_field_class_variant_borrow_option_by_index( (void *) fc, index); } -const struct bt_field_class_variant_with_selector_unsigned_option * -bt_field_class_variant_with_selector_unsigned_borrow_option_by_name_const( +const struct bt_field_class_variant_with_selector_field_integer_unsigned_option * +bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_name_const( const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name); } -const struct bt_field_class_variant_with_selector_unsigned_option * -bt_field_class_variant_with_selector_unsigned_borrow_option_by_index_const( +const struct bt_field_class_variant_with_selector_field_integer_unsigned_option * +bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const( const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( (void *) fc, index); } -const struct bt_field_class_variant_with_selector_signed_option * -bt_field_class_variant_with_selector_signed_borrow_option_by_name_const( +const struct bt_field_class_variant_with_selector_field_integer_signed_option * +bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_name_const( const struct bt_field_class *fc, const char *name) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_by_name( (void *) fc, name); } -const struct bt_field_class_variant_with_selector_signed_option * -bt_field_class_variant_with_selector_signed_borrow_option_by_index_const( +const struct bt_field_class_variant_with_selector_field_integer_signed_option * +bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const( const struct bt_field_class *fc, uint64_t index) { BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); BT_ASSERT_PRE_DEV_FC_HAS_ID(fc, - BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR, + BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD, "Field class"); return (const void *) borrow_named_field_class_from_container_field_class_at_index( @@ -1649,11 +1847,21 @@ 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_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"); @@ -1661,10 +1869,10 @@ bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const( } const struct bt_integer_range_set_signed * -bt_field_class_variant_with_selector_signed_option_borrow_ranges_const( - const struct bt_field_class_variant_with_selector_signed_option *option) +bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_const( + const struct bt_field_class_variant_with_selector_field_integer_signed_option *option) { - const struct bt_field_class_variant_with_selector_option *opt = + const struct bt_field_class_variant_with_selector_field_option *opt = (const void *) option; BT_ASSERT_PRE_DEV_NON_NULL(option, "Variant field class option"); @@ -1672,10 +1880,10 @@ bt_field_class_variant_with_selector_signed_option_borrow_ranges_const( } const struct bt_field_path * -bt_field_class_variant_with_selector_borrow_selector_field_path_const( +bt_field_class_variant_with_selector_field_borrow_selector_field_path_const( const struct bt_field_class *fc) { - const struct bt_field_class_variant_with_selector *var_fc = + const struct bt_field_class_variant_with_selector_field *var_fc = (const void *) fc; BT_ASSERT_PRE_DEV_NON_NULL(fc, "Field class"); @@ -1697,7 +1905,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: @@ -1819,7 +2027,9 @@ struct bt_field_class *bt_field_class_array_dynamic_create( } if (init_array_field_class((void *) array_fc, - BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY, + length_fc ? + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD : + BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITHOUT_LENGTH_FIELD, destroy_dynamic_array_field_class, element_fc)) { goto error; } @@ -1828,7 +2038,7 @@ struct bt_field_class *bt_field_class_array_dynamic_create( BT_ASSERT_PRE_FC_IS_UNSIGNED_INT(length_fc, "Length field class"); array_fc->length_fc = length_fc; - bt_object_get_no_null_check(array_fc->length_fc); + bt_object_get_ref_no_null_check(array_fc->length_fc); bt_field_class_freeze(length_fc); } @@ -1843,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; } @@ -1906,9 +2117,9 @@ void _bt_field_class_freeze(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_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; @@ -1949,9 +2160,9 @@ 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_WITHOUT_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD: + case BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD: { struct bt_field_class_named_field_class_container *container_fc = (void *) fc; @@ -1967,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; @@ -2003,9 +2215,9 @@ void bt_field_class_set_user_attributes( BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP, "User attributes object is not a map value object."); BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class"); - bt_object_put_no_null_check(fc->user_attributes); + bt_object_put_ref_no_null_check(fc->user_attributes); fc->user_attributes = (void *) user_attributes; - bt_object_get_no_null_check(fc->user_attributes); + bt_object_get_ref_no_null_check(fc->user_attributes); } static @@ -2026,9 +2238,9 @@ void bt_named_field_class_set_user_attributes( BT_ASSERT_PRE_DEV_HOT(named_fc, "Structure field class member or variant field class option", "."); - bt_object_put_no_null_check(named_fc->user_attributes); + bt_object_put_ref_no_null_check(named_fc->user_attributes); named_fc->user_attributes = (void *) user_attributes; - bt_object_get_no_null_check(named_fc->user_attributes); + bt_object_get_ref_no_null_check(named_fc->user_attributes); } const struct bt_value *