lib: add bit array field class and field types

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

diff --git a/src/lib/trace-ir/field-class.h b/src/lib/trace-ir/field-class.h
index 476b86dc3b8b3a63fb8f96a7a26a7ef6da612806..77eece7bbe8fa2a12ece112178fde1c87f36484e 100644 (file)
--- a/src/lib/trace-ir/field-class.h
+++ b/src/lib/trace-ir/field-class.h
@@ -186,6 +186,15 @@ struct bt_field_class {
        bool part_of_trace_class;
 };
 
+struct bt_field_class_bool {
+       struct bt_field_class common;
+};
+
+struct bt_field_class_bit_array {
+       struct bt_field_class common;
+       uint64_t length;
+};
+
 struct bt_field_class_integer {
        struct bt_field_class common;
 
@@ -209,8 +218,8 @@ struct bt_field_class_enumeration_mapping {
        const struct bt_integer_range_set *range_set;
 };
 
-struct bt_field_class_unsigned_enumeration_mapping;
-struct bt_field_class_signed_enumeration_mapping;
+struct bt_field_class_enumeration_unsigned_mapping;
+struct bt_field_class_enumeration_signed_mapping;
 
 struct bt_field_class_enumeration {
        struct bt_field_class_integer common;
@@ -221,9 +230,9 @@ struct bt_field_class_enumeration {
        /*
         * This is an array of `const char *` which acts as a temporary
         * (potentially growing) buffer for
-        * bt_field_class_unsigned_enumeration_get_mapping_labels_for_value()
+        * bt_field_class_enumeration_unsigned_get_mapping_labels_for_value()
         * and
-        * bt_field_class_signed_enumeration_get_mapping_labels_for_value().
+        * bt_field_class_enumeration_signed_get_mapping_labels_for_value().
         *
         * The actual strings are owned by the mappings above.
         */
@@ -251,8 +260,8 @@ struct bt_named_field_class {
 
 struct bt_field_class_structure_member;
 struct bt_field_class_variant_option;
-struct bt_field_class_variant_with_unsigned_selector_option;
-struct bt_field_class_variant_with_signed_selector_option;
+struct bt_field_class_variant_with_selector_unsigned_option;
+struct bt_field_class_variant_with_selector_signed_option;
 
 struct bt_field_class_named_field_class_container {
        struct bt_field_class common;
@@ -278,21 +287,34 @@ struct bt_field_class_array {
        struct bt_field_class *element_fc;
 };
 
-struct bt_field_class_static_array {
+struct bt_field_class_array_static {
        struct bt_field_class_array common;
        uint64_t length;
 };
 
-struct bt_field_class_dynamic_array {
+struct bt_field_class_array_dynamic {
        struct bt_field_class_array common;
 
-       /* Weak: never dereferenced, only use to find it elsewhere */
+       /* Owned by this */
        struct bt_field_class *length_fc;
 
        /* Owned by this */
        struct bt_field_path *length_field_path;
 };
 
+struct bt_field_class_option {
+       struct bt_field_class common;
+
+       /* Owned by this */
+       struct bt_field_class *content_fc;
+
+       /* Owned by this */
+       struct bt_field_class *selector_fc;
+
+       /* Owned by this */
+       struct bt_field_path *selector_field_path;
+};
+
 /* Variant FC (with selector) option: named field class + range set */
 struct bt_field_class_variant_with_selector_option {
        struct bt_named_field_class common;