Cleanup: lib: field-class.c: fix logging message for variant FC

[babeltrace.git] / src / lib / trace-ir / field-class.c

diff --git a/src/lib/trace-ir/field-class.c b/src/lib/trace-ir/field-class.c
index 90f6034006c5bc5b16ab39920734d5b48a0f9a6b..ce356b409f6c4008b76ac9bd071d3c49009c8c4f 100644 (file)
--- a/src/lib/trace-ir/field-class.c
+++ b/src/lib/trace-ir/field-class.c
@@ -898,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;
@@ -954,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;
 
@@ -1216,7 +1216,7 @@ struct bt_field_class *create_option_field_class(
                }
 
                opt_with_sel_fc->selector_fc = selector_fc;
-               bt_object_get_no_null_check(opt_with_sel_fc->selector_fc);
+               bt_object_get_ref_no_null_check(opt_with_sel_fc->selector_fc);
                opt_fc = (void *) opt_with_sel_fc;
        } else {
                opt_fc = g_new0(struct bt_field_class_option, 1);
@@ -1235,7 +1235,7 @@ struct bt_field_class *create_option_field_class(
        }
 
        opt_fc->content_fc = content_fc;
-       bt_object_get_no_null_check(opt_fc->content_fc);
+       bt_object_get_ref_no_null_check(opt_fc->content_fc);
        bt_field_class_freeze(opt_fc->content_fc);
 
        if (selector_fc) {
@@ -1303,7 +1303,7 @@ bt_field_class_option_with_selector_integer_unsigned_create(
        }
 
        fc->range_set = range_set;
-       bt_object_get_no_null_check(fc->range_set);
+       bt_object_get_ref_no_null_check(fc->range_set);
        bt_integer_range_set_freeze(range_set);
 
 end:
@@ -1333,7 +1333,7 @@ bt_field_class_option_with_selector_integer_signed_create(
        }
 
        fc->range_set = range_set;
-       bt_object_get_no_null_check(fc->range_set);
+       bt_object_get_ref_no_null_check(fc->range_set);
        bt_integer_range_set_freeze(range_set);
 
 end:
@@ -1480,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(
@@ -1495,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) {
@@ -1513,11 +1515,11 @@ 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:
@@ -1666,7 +1668,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 */
@@ -1698,26 +1700,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)
@@ -1773,52 +1775,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_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(
@@ -1855,8 +1857,8 @@ bt_field_class_variant_option_borrow_field_class(
 }
 
 const struct bt_integer_range_set_unsigned *
-bt_field_class_variant_with_selector_unsigned_option_borrow_ranges_const(
-               const struct bt_field_class_variant_with_selector_unsigned_option *option)
+bt_field_class_variant_with_selector_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;
@@ -1866,8 +1868,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;
@@ -1902,7 +1904,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:
@@ -2033,7 +2035,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);
        }
 
@@ -2112,8 +2114,8 @@ 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_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;
@@ -2155,8 +2157,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;
@@ -2208,9 +2210,9 @@ void bt_field_class_set_user_attributes(
        BT_ASSERT_PRE(user_attributes->type == BT_VALUE_TYPE_MAP,
                "User attributes object is not a map value object.");
        BT_ASSERT_PRE_DEV_FC_HOT(fc, "Field class");
-       bt_object_put_no_null_check(fc->user_attributes);
+       bt_object_put_ref_no_null_check(fc->user_attributes);
        fc->user_attributes = (void *) user_attributes;
-       bt_object_get_no_null_check(fc->user_attributes);
+       bt_object_get_ref_no_null_check(fc->user_attributes);
 }
 
 static
@@ -2231,9 +2233,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 *