Add an alias name attribute and accessor to CTF IR field type

Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index bed6c0addef89d2702862be152961f99154de648..41ecb5bd8cc34d7a3b79d14c30c3db7f23b6e38d 100644 (file)
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -49,6 +49,8 @@ struct range_overlap_query {
        GQuark mapping_name;
 };
 
+static
+void bt_ctf_field_type_destroy(struct bt_ctf_ref *);
 static
 void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *);
 static
@@ -278,6 +280,29 @@ end:
        return ret;
 }
 
+static
+void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref)
+{
+       struct bt_ctf_field_type *type;
+       enum ctf_type_id type_id;
+
+       if (!ref) {
+               return;
+       }
+
+       type = container_of(ref, struct bt_ctf_field_type, ref_count);
+       type_id = type->declaration->id;
+       if (type_id <= CTF_TYPE_UNKNOWN ||
+               type_id >= NR_CTF_TYPES) {
+               return;
+       }
+
+       if (type->alias_name) {
+               g_string_free(type->alias_name, TRUE);
+       }
+       type_destroy_funcs[type_id](ref);
+}
+
 BT_HIDDEN
 int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 {
@@ -1620,6 +1645,20 @@ enum ctf_type_id bt_ctf_field_type_get_type_id(
        return type->declaration->id;
 }
 
+const char *bt_ctf_field_type_get_alias_name(
+               struct bt_ctf_field_type *type)
+{
+       const char *name = NULL;
+
+       if (!type || !type->alias_name) {
+               goto end;
+       }
+
+       name = type->alias_name->str;
+end:
+       return name;
+}
+
 void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
 {
        if (!type) {
@@ -1631,15 +1670,11 @@ void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
 
 void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
 {
-       enum ctf_type_id type_id;
-
        if (!type) {
                return;
        }
 
-       type_id = type->declaration->id;
-       assert(type_id > CTF_TYPE_UNKNOWN && type_id < NR_CTF_TYPES);
-       bt_ctf_ref_put(&type->ref_count, type_destroy_funcs[type_id]);
+       bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy);
 }
 
 BT_HIDDEN

diff --git a/include/babeltrace/ctf-ir/event-types-internal.h b/include/babeltrace/ctf-ir/event-types-internal.h
index 58a94045a034cf9384d5d9372c073652283cb475..dd80bdceb89026560318236b3eaed7286800c9b3 100644 (file)
--- a/include/babeltrace/ctf-ir/event-types-internal.h
+++ b/include/babeltrace/ctf-ir/event-types-internal.h
@@ -44,6 +44,7 @@ typedef int(*type_serialize_func)(struct bt_ctf_field_type *,
 struct bt_ctf_field_type {
        struct bt_ctf_ref ref_count;
        struct bt_declaration *declaration;
+       GString *alias_name;
        type_freeze_func freeze;
        type_serialize_func serialize;
        /*

diff --git a/include/babeltrace/ctf-ir/event-types.h b/include/babeltrace/ctf-ir/event-types.h
index 96200ce42d2d06d996b6ede6483345ac887abf55..18929eaa4ac45945fa8a886c1a0983ede553e951 100644 (file)
--- a/include/babeltrace/ctf-ir/event-types.h
+++ b/include/babeltrace/ctf-ir/event-types.h
@@ -718,6 +718,21 @@ extern int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
 extern enum ctf_type_id bt_ctf_field_type_get_type_id(
                struct bt_ctf_field_type *type);
 
+/*
+ * bt_ctf_field_type_get_alias_nameL get a field type's alias name
+ *
+ * A type's alias name is set if it was resolved from a typedef or
+ * typealias. Note that types that are resolved from a ypealias or
+ * typedef are distinct from the underlying type and can't be compared
+ * pointer-wise.
+ *
+ * @param type Field type.
+ *
+ * Returns a field type's alias name, NULL on error.
+ */
+extern const char *bt_ctf_field_type_get_alias_name(
+               struct bt_ctf_field_type *type);
+
 /*
  * bt_ctf_field_type_get and bt_ctf_field_type_put: increment and decrement
  * the field type's reference count.