lib: rename option/var. "selector" to "selector field"
[babeltrace.git] / src / plugins / lttng-utils / debug-info / trace-ir-metadata-field-class-copy.c
index 30c87014febaa8d36b1351790fda7241845eef53..79da94e1171d3cdd12edf86d333cf0d8fe86178e 100644 (file)
@@ -27,7 +27,7 @@
 #define BT_COMP_LOG_SELF_COMP (md_maps->self_comp)
 #define BT_LOG_OUTPUT_LEVEL (md_maps->log_level)
 #define BT_LOG_TAG "PLUGIN/FLT.LTTNG-UTILS.DEBUG-INFO/TRACE-IR-META-FC-COPY"
-#include "plugins/comp-logging.h"
+#include "logging/comp-logging.h"
 
 #include "common/assert.h"
 #include "common/common.h"
@@ -51,7 +51,7 @@ const bt_field_class *walk_field_path(struct trace_ir_metadata_maps *md_maps,
 
        BT_ASSERT(bt_field_class_get_type(fc) == BT_FIELD_CLASS_TYPE_STRUCTURE);
        BT_COMP_LOGD("Walking field path on field class: fp-addr=%p, fc-addr=%p",
-                       fp, fc);
+               fp, fc);
 
        fp_item_count = bt_field_path_get_item_count(fp);
        curr_fc = fc;
@@ -74,9 +74,20 @@ const bt_field_class *walk_field_path(struct trace_ir_metadata_maps *md_maps,
                                member);
                        break;
                }
-               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_OPTION_WITHOUT_SELECTOR_FIELD:
+               case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+               case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+               case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+               {
+                       BT_ASSERT(bt_field_path_item_get_type(fp_item) ==
+                               BT_FIELD_PATH_ITEM_TYPE_CURRENT_OPTION_CONTENT);
+                       curr_fc = bt_field_class_option_borrow_field_class_const(
+                               curr_fc);
+                       break;
+               }
+               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:
                {
                        const bt_field_class_variant_option *option;
 
@@ -90,7 +101,8 @@ const bt_field_class *walk_field_path(struct trace_ir_metadata_maps *md_maps,
                        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:
                {
                        BT_ASSERT(bt_field_path_item_get_type(fp_item) ==
                                BT_FIELD_PATH_ITEM_TYPE_CURRENT_ARRAY_ELEMENT);
@@ -112,7 +124,7 @@ const bt_field_class *resolve_field_path_to_field_class(const bt_field_path *fp,
 {
        struct field_class_resolving_context *fc_resolving_ctx;
        const bt_field_class *fc;
-       bt_scope fp_scope;
+       bt_field_path_scope fp_scope;
 
        BT_COMP_LOGD("Resolving field path: fp-addr=%p", fp);
 
@@ -120,19 +132,19 @@ const bt_field_class *resolve_field_path_to_field_class(const bt_field_path *fp,
        fp_scope = bt_field_path_get_root_scope(fp);
 
        switch (fp_scope) {
-       case BT_SCOPE_PACKET_CONTEXT:
+       case BT_FIELD_PATH_SCOPE_PACKET_CONTEXT:
                fc = walk_field_path(md_maps, fp,
                        fc_resolving_ctx->packet_context);
                break;
-       case BT_SCOPE_EVENT_COMMON_CONTEXT:
+       case BT_FIELD_PATH_SCOPE_EVENT_COMMON_CONTEXT:
                fc = walk_field_path(md_maps, fp,
                        fc_resolving_ctx->event_common_context);
                break;
-       case BT_SCOPE_EVENT_SPECIFIC_CONTEXT:
+       case BT_FIELD_PATH_SCOPE_EVENT_SPECIFIC_CONTEXT:
                fc = walk_field_path(md_maps, fp,
                        fc_resolving_ctx->event_specific_context);
                break;
-       case BT_SCOPE_EVENT_PAYLOAD:
+       case BT_FIELD_PATH_SCOPE_EVENT_PAYLOAD:
                fc = walk_field_path(md_maps, fp,
                        fc_resolving_ctx->event_payload);
                break;
@@ -148,9 +160,42 @@ void field_class_integer_set_props(const bt_field_class *input_fc,
                bt_field_class *output_fc)
 {
        bt_field_class_integer_set_preferred_display_base(output_fc,
-                       bt_field_class_integer_get_preferred_display_base(input_fc));
+               bt_field_class_integer_get_preferred_display_base(input_fc));
        bt_field_class_integer_set_field_value_range(output_fc,
-                       bt_field_class_integer_get_field_value_range(input_fc));
+               bt_field_class_integer_get_field_value_range(input_fc));
+}
+
+static inline
+int field_class_bool_copy(struct trace_ir_metadata_maps *md_maps,
+               const bt_field_class *in_field_class,
+               bt_field_class *out_field_class)
+{
+       BT_COMP_LOGD("Copying content of boolean field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+       /*
+        * There is no content to copy. Keep this function call anyway for
+        * logging purposes.
+        */
+       BT_COMP_LOGD("Copied content of boolean field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+       return 0;
+}
+
+static inline
+int field_class_bit_array_copy(
+               struct trace_ir_metadata_maps *md_maps,
+               const bt_field_class *in_field_class,
+               bt_field_class *out_field_class)
+{
+       BT_COMP_LOGD("Copying content of bit array field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+       /*
+        * There is no content to copy. Keep this function call anyway for
+        * logging purposes.
+        */
+       BT_COMP_LOGD("Copied content of bit array field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+       return 0;
 }
 
 static inline
@@ -160,14 +205,12 @@ int field_class_unsigned_integer_copy(
                bt_field_class *out_field_class)
 {
        BT_COMP_LOGD("Copying content of unsigned integer field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
        field_class_integer_set_props(in_field_class, out_field_class);
 
        BT_COMP_LOGD("Copied content of unsigned integer field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
        return 0;
 }
 
@@ -178,14 +221,12 @@ int field_class_signed_integer_copy(
                bt_field_class *out_field_class)
 {
        BT_COMP_LOGD("Copying content of signed integer field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
        field_class_integer_set_props(in_field_class, out_field_class);
 
        BT_COMP_LOGD("Copied content of signed integer field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
        return 0;
 }
 
@@ -199,28 +240,28 @@ int field_class_unsigned_enumeration_copy(
        int ret = 0;
 
        BT_COMP_LOGD("Copying content of unsigned enumeration field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
        /* Copy properties of the inner integer. */
        field_class_integer_set_props(in_field_class, out_field_class);
 
        /* Copy all enumeration entries. */
-       enum_mapping_count = bt_field_class_enumeration_get_mapping_count(in_field_class);
+       enum_mapping_count = bt_field_class_enumeration_get_mapping_count(
+               in_field_class);
        for (i = 0; i < enum_mapping_count; i++) {
                const char *label;
                const bt_integer_range_set_unsigned *range_set;
-               const bt_field_class_unsigned_enumeration_mapping *u_mapping;
+               const bt_field_class_enumeration_unsigned_mapping *u_mapping;
                const bt_field_class_enumeration_mapping *mapping;
 
-               u_mapping = bt_field_class_unsigned_enumeration_borrow_mapping_by_index_const(
-                               in_field_class, i);
-               mapping = bt_field_class_unsigned_enumeration_mapping_as_mapping_const(
+               u_mapping = bt_field_class_enumeration_unsigned_borrow_mapping_by_index_const(
+                       in_field_class, i);
+               mapping = bt_field_class_enumeration_unsigned_mapping_as_mapping_const(
                        u_mapping);
                label = bt_field_class_enumeration_mapping_get_label(mapping);
-               range_set = bt_field_class_unsigned_enumeration_mapping_borrow_ranges_const(
+               range_set = bt_field_class_enumeration_unsigned_mapping_borrow_ranges_const(
                        u_mapping);
-               ret = bt_field_class_unsigned_enumeration_add_mapping(
+               ret = bt_field_class_enumeration_unsigned_add_mapping(
                        out_field_class, label, range_set);
                if (ret) {
                        goto error;
@@ -228,8 +269,7 @@ int field_class_unsigned_enumeration_copy(
        }
 
        BT_COMP_LOGD("Copied content of unsigned enumeration field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
 error:
        return ret;
@@ -245,8 +285,7 @@ int field_class_signed_enumeration_copy(
        int ret = 0;
 
        BT_COMP_LOGD("Copying content of signed enumeration field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
        /* Copy properties of the inner integer. */
        field_class_integer_set_props(in_field_class, out_field_class);
@@ -257,17 +296,17 @@ int field_class_signed_enumeration_copy(
        for (i = 0; i < enum_mapping_count; i++) {
                const char *label;
                const bt_integer_range_set_signed *range_set;
-               const bt_field_class_signed_enumeration_mapping *s_mapping;
+               const bt_field_class_enumeration_signed_mapping *s_mapping;
                const bt_field_class_enumeration_mapping *mapping;
 
-               s_mapping = bt_field_class_signed_enumeration_borrow_mapping_by_index_const(
-                               in_field_class, i);
-               mapping = bt_field_class_signed_enumeration_mapping_as_mapping_const(
+               s_mapping = bt_field_class_enumeration_signed_borrow_mapping_by_index_const(
+                       in_field_class, i);
+               mapping = bt_field_class_enumeration_signed_mapping_as_mapping_const(
                        s_mapping);
                label = bt_field_class_enumeration_mapping_get_label(mapping);
-               range_set = bt_field_class_signed_enumeration_mapping_borrow_ranges_const(
+               range_set = bt_field_class_enumeration_signed_mapping_borrow_ranges_const(
                        s_mapping);
-               ret = bt_field_class_signed_enumeration_add_mapping(
+               ret = bt_field_class_enumeration_signed_add_mapping(
                        out_field_class, label, range_set);
                if (ret) {
                        goto error;
@@ -275,28 +314,38 @@ int field_class_signed_enumeration_copy(
        }
 
        BT_COMP_LOGD("Copied content of signed enumeration field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
 error:
        return ret;
 }
 
 static inline
-int field_class_real_copy(
+int field_class_single_precision_real_copy(
                struct trace_ir_metadata_maps *md_maps,
                const bt_field_class *in_field_class,
                bt_field_class *out_field_class)
 {
-       BT_COMP_LOGD("Copying content of real field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+       BT_COMP_LOGD("Copying content of single-precision real field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
-       bt_field_class_real_set_is_single_precision(out_field_class,
-                       bt_field_class_real_is_single_precision(in_field_class));
+       BT_COMP_LOGD("Copied content single-precision real field class:"
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+
+       return 0;
+}
+
+static inline
+int field_class_double_precision_real_copy(
+               struct trace_ir_metadata_maps *md_maps,
+               const bt_field_class *in_field_class,
+               bt_field_class *out_field_class)
+{
+       BT_COMP_LOGD("Copying content of double-precision real field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
-       BT_COMP_LOGD("Copied content real field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+       BT_COMP_LOGD("Copied content double-precision real field class:"
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
        return 0;
 }
@@ -311,40 +360,38 @@ int field_class_structure_copy(
        int ret = 0;
 
        BT_COMP_LOGD("Copying content of structure field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
        /* Get the number of member in that struct. */
        struct_member_count =
                bt_field_class_structure_get_member_count(in_field_class);
 
        /* Iterate over all the members of the struct. */
        for (i = 0; i < struct_member_count; i++) {
-               const bt_field_class_structure_member *member;
+               const bt_field_class_structure_member *in_member;
+               bt_field_class_structure_member *out_member;
                const char *member_name;
-               const bt_field_class *member_fc;
+               const bt_field_class *in_member_fc;
                bt_field_class *out_member_field_class;
 
-               member = bt_field_class_structure_borrow_member_by_index_const(
+               in_member = bt_field_class_structure_borrow_member_by_index_const(
                        in_field_class, i);
-               member_fc = bt_field_class_structure_member_borrow_field_class_const(
-                       member);
-               member_name = bt_field_class_structure_member_get_name(member);
+               in_member_fc = bt_field_class_structure_member_borrow_field_class_const(
+                       in_member);
+               member_name = bt_field_class_structure_member_get_name(in_member);
                BT_COMP_LOGD("Copying structure field class's field: "
-                       "index=%" PRId64 ", "
-                       "member-fc-addr=%p, field-name=\"%s\"",
-                       i, member_fc, member_name);
+                       "index=%" PRId64 ", member-fc-addr=%p, field-name=\"%s\"",
+                       i, in_member_fc, member_name);
 
                out_member_field_class = create_field_class_copy(md_maps,
-                               member_fc);
+                               in_member_fc);
                if (!out_member_field_class) {
                        BT_COMP_LOGE("Cannot copy structure field class's field: "
-                               "index=%" PRId64 ", "
-                               "field-fc-addr=%p, field-name=\"%s\"",
-                               i, member_fc, member_name);
+                               "index=%" PRId64 ", field-fc-addr=%p, field-name=\"%s\"",
+                               i, in_member_fc, member_name);
                        ret = -1;
                        goto error;
                }
-               ret = copy_field_class_content(md_maps, member_fc,
+               ret = copy_field_class_content(md_maps, in_member_fc,
                                out_member_field_class);
                if (ret) {
                        goto error;
@@ -356,11 +403,24 @@ int field_class_structure_copy(
                        BT_COMP_LOGE("Cannot append structure field class's field: "
                                "index=%" PRId64 ", "
                                "field-fc-addr=%p, field-name=\"%s\"",
-                               i, member_fc, member_name);
+                               i, in_member_fc, member_name);
                        BT_FIELD_CLASS_PUT_REF_AND_RESET(out_member_field_class);
                        ret = -1;
                        goto error;
                }
+
+               out_member = bt_field_class_structure_borrow_member_by_index(
+                       out_field_class, i);
+               BT_ASSERT(out_member);
+
+               /*
+                * Safe to use the same value object because it's frozen
+                * at this point.
+                */
+               bt_field_class_structure_member_set_user_attributes(
+                       out_member,
+                       bt_field_class_structure_member_borrow_user_attributes_const(
+                               in_member));
        }
 
        BT_COMP_LOGD("Copied structure field class: original-fc-addr=%p, copy-fc-addr=%p",
@@ -382,83 +442,96 @@ int field_class_variant_copy(
        int ret = 0;
 
        BT_COMP_LOGD("Copying content of variant field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
        variant_option_count =
                bt_field_class_variant_get_option_count(in_field_class);
        for (i = 0; i < variant_option_count; i++) {
-               const bt_field_class *option_fc;
+               const bt_field_class *in_option_fc;
                const char *option_name;
                bt_field_class *out_option_field_class;
-               const bt_field_class_variant_option *option;
+               const bt_field_class_variant_option *in_option;
+               bt_field_class_variant_option *out_option;
 
-               option = bt_field_class_variant_borrow_option_by_index_const(
+               in_option = bt_field_class_variant_borrow_option_by_index_const(
                        in_field_class, i);
-               option_fc = bt_field_class_variant_option_borrow_field_class_const(
-                       option);
-               option_name = bt_field_class_variant_option_get_name(option);
+               in_option_fc = bt_field_class_variant_option_borrow_field_class_const(
+                       in_option);
+               option_name = bt_field_class_variant_option_get_name(in_option);
                out_option_field_class = create_field_class_copy_internal(
-                               md_maps, option_fc);
+                               md_maps, in_option_fc);
                if (!out_option_field_class) {
                        BT_COMP_LOGE_STR("Cannot copy field class.");
                        ret = -1;
                        goto error;
                }
-               ret = copy_field_class_content_internal(md_maps, option_fc,
-                               out_option_field_class);
+               ret = copy_field_class_content_internal(md_maps, in_option_fc,
+                       out_option_field_class);
                if (ret) {
                        BT_COMP_LOGE_STR("Error copying content of option variant "
                                        "field class'");
                        goto error;
                }
 
-               if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR) {
-                       const bt_field_class_variant_with_unsigned_selector_option *spec_opt =
-                               bt_field_class_variant_with_unsigned_selector_borrow_option_by_index_const(
+               if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD) {
+                       const bt_field_class_variant_with_selector_field_integer_unsigned_option *spec_opt =
+                               bt_field_class_variant_with_selector_field_integer_unsigned_borrow_option_by_index_const(
                                        in_field_class, i);
                        const bt_integer_range_set_unsigned *ranges =
-                               bt_field_class_variant_with_unsigned_selector_option_borrow_ranges_const(
+                               bt_field_class_variant_with_selector_field_integer_unsigned_option_borrow_ranges_const(
                                        spec_opt);
 
-                       if (bt_field_class_variant_with_unsigned_selector_append_option(
+                       if (bt_field_class_variant_with_selector_field_integer_unsigned_append_option(
                                        out_field_class, option_name,
                                        out_option_field_class, ranges) !=
-                                       BT_FIELD_CLASS_VARIANT_WITH_SELECTOR_APPEND_OPTION_STATUS_OK) {
-                               BT_COMP_LOGE_STR("Cannot append option to variant field class with unsigned selector'");
+                                       BT_FIELD_CLASS_VARIANT_WITH_SELECTOR_FIELD_APPEND_OPTION_STATUS_OK) {
+                               BT_COMP_LOGE_STR("Cannot append option to variant field class with unsigned integer selector'");
                                BT_FIELD_CLASS_PUT_REF_AND_RESET(out_tag_field_class);
                                ret = -1;
                                goto error;
                        }
-               } else if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
-                       const bt_field_class_variant_with_signed_selector_option *spec_opt =
-                               bt_field_class_variant_with_signed_selector_borrow_option_by_index_const(
+               } else if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+                       const bt_field_class_variant_with_selector_field_integer_signed_option *spec_opt =
+                               bt_field_class_variant_with_selector_field_integer_signed_borrow_option_by_index_const(
                                        in_field_class, i);
                        const bt_integer_range_set_signed *ranges =
-                               bt_field_class_variant_with_signed_selector_option_borrow_ranges_const(
+                               bt_field_class_variant_with_selector_field_integer_signed_option_borrow_ranges_const(
                                        spec_opt);
 
-                       if (bt_field_class_variant_with_signed_selector_append_option(
+                       if (bt_field_class_variant_with_selector_field_integer_signed_append_option(
                                        out_field_class, option_name,
                                        out_option_field_class, ranges) !=
-                                       BT_FIELD_CLASS_VARIANT_WITH_SELECTOR_APPEND_OPTION_STATUS_OK) {
-                               BT_COMP_LOGE_STR("Cannot append option to variant field class with signed selector'");
+                                       BT_FIELD_CLASS_VARIANT_WITH_SELECTOR_FIELD_APPEND_OPTION_STATUS_OK) {
+                               BT_COMP_LOGE_STR("Cannot append option to variant field class with signed integer selector'");
                                BT_FIELD_CLASS_PUT_REF_AND_RESET(out_tag_field_class);
                                ret = -1;
                                goto error;
                        }
                } else {
-                       BT_ASSERT(fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR);
+                       BT_ASSERT(fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITHOUT_SELECTOR_FIELD);
 
                        if (bt_field_class_variant_without_selector_append_option(
                                        out_field_class, option_name,
                                        out_option_field_class) !=
-                                       BT_FIELD_CLASS_VARIANT_WITHOUT_SELECTOR_APPEND_OPTION_STATUS_OK) {
+                                       BT_FIELD_CLASS_VARIANT_WITHOUT_SELECTOR_FIELD_APPEND_OPTION_STATUS_OK) {
                                BT_COMP_LOGE_STR("Cannot append option to variant field class'");
                                BT_FIELD_CLASS_PUT_REF_AND_RESET(out_tag_field_class);
                                ret = -1;
                                goto error;
                        }
                }
+
+               out_option = bt_field_class_variant_borrow_option_by_index(
+                       out_field_class, i);
+               BT_ASSERT(out_option);
+
+               /*
+                * Safe to use the same value object because it's frozen
+                * at this point.
+                */
+               bt_field_class_variant_option_set_user_attributes(
+                       out_option,
+                       bt_field_class_variant_option_borrow_user_attributes_const(
+                               in_option));
        }
 
        BT_COMP_LOGD("Copied content of variant field class: in-fc-addr=%p, "
@@ -475,13 +548,13 @@ int field_class_static_array_copy(
                bt_field_class *out_field_class)
 {
        BT_COMP_LOGD("Copying content of static array field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+               "out-fc-addr=%p", in_field_class, out_field_class);
        /*
         * There is no content to copy. Keep this function call anyway for
         * logging purposes.
         */
        BT_COMP_LOGD("Copied content of static array field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+               "out-fc-addr=%p", in_field_class, out_field_class);
 
        return 0;
 }
@@ -492,48 +565,39 @@ int field_class_dynamic_array_copy(
                const bt_field_class *in_field_class,
                bt_field_class *out_field_class)
 {
-       const bt_field_class *len_fc;
-       const bt_field_path *len_fp;
-       bt_field_class *out_len_field_class;
-       int ret = 0;
-
        BT_COMP_LOGD("Copying content of dynamic array field class: "
-                       "in-fc-addr=%p, out-fc-addr=%p",
-                       in_field_class, out_field_class);
-
-       len_fp = bt_field_class_dynamic_array_borrow_length_field_path_const(
-                       in_field_class);
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+       /*
+        * There is no content to copy. Keep this function call anyway for
+        * logging purposes.
+        */
+       BT_COMP_LOGD("Copied content of dynamic array field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
-       if (len_fp) {
-               BT_COMP_LOGD("Copying dynamic array length field class using "
-                               "field path: in-len-fp=%p", len_fp);
-               len_fc = resolve_field_path_to_field_class(
-                               len_fp, md_maps);
-               out_len_field_class = g_hash_table_lookup(
-                               md_maps->field_class_map, len_fc);
-               if (!out_len_field_class) {
-                       BT_COMP_LOGE_STR("Cannot find the output matching length"
-                                       "field class.");
-                       ret = -1;
-                       goto error;
-               }
+       return 0;
+}
 
-               if (bt_field_class_dynamic_array_set_length_field_class(
-                               out_field_class, out_len_field_class) !=
-                               BT_FIELD_CLASS_DYNAMIC_ARRAY_SET_LENGTH_FIELD_CLASS_STATUS_OK) {
-                       BT_COMP_LOGE_STR("Cannot set dynamic array field class' "
-                                       "length field class.");
-                       BT_FIELD_CLASS_PUT_REF_AND_RESET(out_len_field_class);
-                       ret = -1;
-                       goto error;
-               }
+static inline
+int field_class_option_copy(
+               struct trace_ir_metadata_maps *md_maps,
+               const bt_field_class *in_field_class,
+               bt_field_class *out_field_class)
+{
+       BT_COMP_LOGD("Copying content of option field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
+
+       if (bt_field_class_get_type(out_field_class) ==
+                       BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) {
+               bt_field_class_option_with_selector_field_bool_set_selector_is_reversed(
+                       out_field_class,
+                       bt_field_class_option_with_selector_field_bool_selector_is_reversed(
+                               in_field_class));
        }
 
-       BT_COMP_LOGD("Copied dynamic array field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+       BT_COMP_LOGD("Copied content of option field class: "
+               "in-fc-addr=%p, out-fc-addr=%p", in_field_class, out_field_class);
 
-error:
-       return ret;
+       return 0;
 }
 
 static inline
@@ -542,13 +606,13 @@ int field_class_string_copy(struct trace_ir_metadata_maps *md_maps,
                bt_field_class *out_field_class)
 {
        BT_COMP_LOGD("Copying content of string field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+               "out-fc-addr=%p", in_field_class, out_field_class);
        /*
         * There is no content to copy. Keep this function call anyway for
         * logging purposes.
         */
        BT_COMP_LOGD("Copied content of string field class: in-fc-addr=%p, "
-                       "out-fc-addr=%p", in_field_class, out_field_class);
+               "out-fc-addr=%p", in_field_class, out_field_class);
 
        return 0;
 }
@@ -562,16 +626,16 @@ bt_field_class *copy_field_class_array_element(struct trace_ir_metadata_maps *md
                create_field_class_copy_internal(md_maps, in_elem_fc);
        if (!out_elem_fc) {
                BT_COMP_LOGE("Error creating output elem field class "
-                               "from input elem field class for static array: "
-                               "in-fc-addr=%p", in_elem_fc);
+                       "from input elem field class for static array: "
+                       "in-fc-addr=%p", in_elem_fc);
                goto error;
        }
 
        ret = copy_field_class_content_internal(md_maps, in_elem_fc, out_elem_fc);
        if (ret) {
                BT_COMP_LOGE("Error creating output elem field class "
-                               "from input elem field class for static array: "
-                               "in-fc-addr=%p", in_elem_fc);
+                       "from input elem field class for static array: "
+                       "in-fc-addr=%p", in_elem_fc);
                BT_FIELD_CLASS_PUT_REF_AND_RESET(out_elem_fc);
                goto error;
        }
@@ -588,44 +652,58 @@ bt_field_class *create_field_class_copy_internal(struct trace_ir_metadata_maps *
        bt_field_class_type fc_type = bt_field_class_get_type(in_field_class);
 
        BT_COMP_LOGD("Creating bare field class based on field class: in-fc-addr=%p",
-                       in_field_class);
+               in_field_class);
 
        switch (fc_type) {
+       case BT_FIELD_CLASS_TYPE_BOOL:
+               out_field_class = bt_field_class_bool_create(
+                       md_maps->output_trace_class);
+               break;
+       case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+               out_field_class = bt_field_class_bit_array_create(
+                       md_maps->output_trace_class,
+                       bt_field_class_bit_array_get_length(
+                               in_field_class));
+               break;
        case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
-               out_field_class = bt_field_class_unsigned_integer_create(
-                               md_maps->output_trace_class);
+               out_field_class = bt_field_class_integer_unsigned_create(
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_SIGNED_INTEGER:
-               out_field_class = bt_field_class_signed_integer_create(
-                               md_maps->output_trace_class);
+               out_field_class = bt_field_class_integer_signed_create(
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_UNSIGNED_ENUMERATION:
-               out_field_class = bt_field_class_unsigned_enumeration_create(
-                               md_maps->output_trace_class);
+               out_field_class = bt_field_class_enumeration_unsigned_create(
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_SIGNED_ENUMERATION:
-               out_field_class = bt_field_class_signed_enumeration_create(
-                               md_maps->output_trace_class);
+               out_field_class = bt_field_class_enumeration_signed_create(
+                       md_maps->output_trace_class);
+               break;
+       case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+               out_field_class = bt_field_class_real_single_precision_create(
+                       md_maps->output_trace_class);
                break;
-       case BT_FIELD_CLASS_TYPE_REAL:
-               out_field_class = bt_field_class_real_create(
-                               md_maps->output_trace_class);
+       case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+               out_field_class = bt_field_class_real_double_precision_create(
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_STRING:
                out_field_class = bt_field_class_string_create(
-                               md_maps->output_trace_class);
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_STRUCTURE:
                out_field_class = bt_field_class_structure_create(
-                               md_maps->output_trace_class);
+                       md_maps->output_trace_class);
                break;
        case BT_FIELD_CLASS_TYPE_STATIC_ARRAY:
        {
                const bt_field_class *in_elem_fc =
                        bt_field_class_array_borrow_element_field_class_const(
                                        in_field_class);
-               uint64_t array_len =
-                       bt_field_class_static_array_get_length(in_field_class);
+               uint64_t array_len = bt_field_class_array_static_get_length(
+                       in_field_class);
 
                bt_field_class *out_elem_fc = copy_field_class_array_element(
                                md_maps, in_elem_fc);
@@ -634,40 +712,135 @@ bt_field_class *create_field_class_copy_internal(struct trace_ir_metadata_maps *
                        goto error;
                }
 
-               out_field_class = bt_field_class_static_array_create(
-                               md_maps->output_trace_class,
-                               out_elem_fc, array_len);
+               out_field_class = bt_field_class_array_static_create(
+                       md_maps->output_trace_class,
+                       out_elem_fc, array_len);
                break;
        }
-       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:
        {
                const bt_field_class *in_elem_fc =
                        bt_field_class_array_borrow_element_field_class_const(
                                        in_field_class);
-
+               bt_field_class *out_length_fc = NULL;
                bt_field_class *out_elem_fc = copy_field_class_array_element(
-                               md_maps, in_elem_fc);
+                       md_maps, in_elem_fc);
+
                if (!out_elem_fc) {
                        out_field_class = NULL;
                        goto error;
                }
 
-               out_field_class = bt_field_class_dynamic_array_create(
-                               md_maps->output_trace_class,
-                               out_elem_fc);
+               if (fc_type == BT_FIELD_CLASS_TYPE_DYNAMIC_ARRAY_WITH_LENGTH_FIELD) {
+                       const bt_field_path *length_fp =
+                               bt_field_class_array_dynamic_with_length_field_borrow_length_field_path_const(
+                                       in_field_class);
+                       const bt_field_class *in_length_fc =
+                               resolve_field_path_to_field_class(length_fp,
+                                       md_maps);
+
+                       BT_ASSERT(in_length_fc);
+                       out_length_fc = g_hash_table_lookup(md_maps->field_class_map,
+                               in_length_fc);
+                       BT_ASSERT(out_length_fc);
+               }
+
+               out_field_class = bt_field_class_array_dynamic_create(
+                       md_maps->output_trace_class,
+                       out_elem_fc, out_length_fc);
+               break;
+       }
+       case BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+       {
+               const bt_field_class *in_content_fc =
+                       bt_field_class_option_borrow_field_class_const(
+                               in_field_class);
+               bt_field_class *out_selector_fc = NULL;
+               bt_field_class *out_content_fc;
+               int ret;
+
+               out_content_fc = create_field_class_copy_internal(
+                       md_maps, in_content_fc);
+               if (!out_content_fc) {
+                       BT_COMP_LOGE_STR("Cannot copy option's content field class.");
+                       goto error;
+               }
+
+               ret = copy_field_class_content_internal(md_maps,
+                       in_content_fc, out_content_fc);
+               if (ret) {
+                       BT_COMP_LOGE_STR("Error copying content of option's "
+                               "content field class");
+                       goto error;
+               }
+
+               if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITHOUT_SELECTOR_FIELD) {
+                       out_field_class =
+                               bt_field_class_option_without_selector_create(
+                                       md_maps->output_trace_class,
+                                       out_content_fc);
+               } else {
+                       const bt_field_path *in_selector_fp =
+                               bt_field_class_option_with_selector_field_borrow_selector_field_path_const(
+                                       in_field_class);
+                       const bt_field_class *in_selector_fc;
+
+                       BT_ASSERT(in_selector_fp);
+                       in_selector_fc = resolve_field_path_to_field_class(
+                               in_selector_fp, md_maps);
+                       BT_ASSERT(in_selector_fc);
+                       out_selector_fc = g_hash_table_lookup(
+                               md_maps->field_class_map, in_selector_fc);
+                       BT_ASSERT(out_selector_fc);
+
+                       if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD) {
+                               out_field_class =
+                                       bt_field_class_option_with_selector_field_bool_create(
+                                               md_maps->output_trace_class,
+                                               out_content_fc, out_selector_fc);
+                       } else if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD) {
+                               const bt_integer_range_set_unsigned *ranges =
+                                       bt_field_class_option_with_selector_field_integer_unsigned_borrow_selector_ranges_const(
+                                               in_field_class);
+
+                               BT_ASSERT(ranges);
+                               out_field_class =
+                                       bt_field_class_option_with_selector_field_integer_unsigned_create(
+                                               md_maps->output_trace_class,
+                                               out_content_fc, out_selector_fc,
+                                               ranges);
+                       } else if (fc_type == BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
+                               const bt_integer_range_set_signed *ranges =
+                                       bt_field_class_option_with_selector_field_integer_signed_borrow_selector_ranges_const(
+                                               in_field_class);
+
+                               BT_ASSERT(ranges);
+                               out_field_class =
+                                       bt_field_class_option_with_selector_field_integer_signed_create(
+                                               md_maps->output_trace_class,
+                                               out_content_fc, out_selector_fc,
+                                               ranges);
+                       }
+               }
+
+               BT_ASSERT(out_field_class);
                break;
        }
-       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:
        {
                bt_field_class *out_sel_fc = NULL;
 
-               if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_SELECTOR ||
-                               fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_SELECTOR) {
+               if (fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD ||
+                               fc_type == BT_FIELD_CLASS_TYPE_VARIANT_WITH_SIGNED_INTEGER_SELECTOR_FIELD) {
                        const bt_field_class *in_sel_fc;
                        const bt_field_path *sel_fp =
-                               bt_field_class_variant_with_selector_borrow_selector_field_path_const(
+                               bt_field_class_variant_with_selector_field_borrow_selector_field_path_const(
                                        in_field_class);
 
                        BT_ASSERT(sel_fp);
@@ -693,7 +866,7 @@ bt_field_class *create_field_class_copy_internal(struct trace_ir_metadata_maps *
         * classes.
         */
        g_hash_table_insert(md_maps->field_class_map,
-                       (gpointer) in_field_class, out_field_class);
+               (gpointer) in_field_class, out_field_class);
 
 error:
        if(out_field_class){
@@ -714,7 +887,23 @@ int copy_field_class_content_internal(
                bt_field_class *out_field_class)
 {
        int ret = 0;
+
+       /*
+        * Safe to use the same value object because it's frozen at this
+        * point.
+        */
+       bt_field_class_set_user_attributes(out_field_class,
+               bt_field_class_borrow_user_attributes_const(in_field_class));
+
        switch(bt_field_class_get_type(in_field_class)) {
+       case BT_FIELD_CLASS_TYPE_BOOL:
+               ret = field_class_bool_copy(md_maps,
+                               in_field_class, out_field_class);
+               break;
+       case BT_FIELD_CLASS_TYPE_BIT_ARRAY:
+               ret = field_class_bit_array_copy(md_maps,
+                               in_field_class, out_field_class);
+               break;
        case BT_FIELD_CLASS_TYPE_UNSIGNED_INTEGER:
                ret = field_class_unsigned_integer_copy(md_maps,
                                in_field_class, out_field_class);
@@ -731,8 +920,12 @@ int copy_field_class_content_internal(
                ret = field_class_signed_enumeration_copy(md_maps,
                                in_field_class, out_field_class);
                break;
-       case BT_FIELD_CLASS_TYPE_REAL:
-               ret = field_class_real_copy(md_maps,
+       case BT_FIELD_CLASS_TYPE_SINGLE_PRECISION_REAL:
+               ret = field_class_single_precision_real_copy(md_maps,
+                               in_field_class, out_field_class);
+               break;
+       case BT_FIELD_CLASS_TYPE_DOUBLE_PRECISION_REAL:
+               ret = field_class_double_precision_real_copy(md_maps,
                                in_field_class, out_field_class);
                break;
        case BT_FIELD_CLASS_TYPE_STRING:
@@ -747,13 +940,21 @@ int copy_field_class_content_internal(
                ret = field_class_static_array_copy(md_maps,
                                in_field_class, out_field_class);
                break;
-       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:
                ret = field_class_dynamic_array_copy(md_maps,
                                in_field_class, out_field_class);
                break;
-       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_OPTION_WITHOUT_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_BOOL_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_UNSIGNED_INTEGER_SELECTOR_FIELD:
+       case BT_FIELD_CLASS_TYPE_OPTION_WITH_SIGNED_INTEGER_SELECTOR_FIELD:
+               ret = field_class_option_copy(md_maps,
+                               in_field_class, out_field_class);
+               break;
+       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:
                ret = field_class_variant_copy(md_maps,
                                in_field_class, out_field_class);
                break;
This page took 0.037216 seconds and 4 git commands to generate.