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;
}
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
{
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);
}
}
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;
}
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;
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)
{
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) {
+ 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);
}
-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) {
+ 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;
+ }
}
- 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);
}
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_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_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 *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_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)
{
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(
}
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) {
/* 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;
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 */
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)
(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_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(
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;
}
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;
}
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:
}
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;
}
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);
}
}
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;
}
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;
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;
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;
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
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 *