X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=f4ac0ecfd0b774925960fb0da06f0e7f41b6f083;hb=b011f6b0d77e0a93fffa1b47ee32e1b07dd16a8a;hp=e7263d5cc55d802c2ae90eac8041a9f2c4849d84;hpb=6964b7fd27e2e314b8acd5d72142bbe41f02c868;p=babeltrace.git

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index e7263d5c..f4ac0ecf 100644
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -28,9 +28,13 @@
 
 #include <babeltrace/ctf-writer/event-types.h>
 #include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/ctf-ir/field-path-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ref.h>
 #include <babeltrace/ctf-ir/clock.h>
 #include <babeltrace/ctf-writer/writer-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/ref.h>
 #include <babeltrace/compiler.h>
 #include <babeltrace/endian.h>
 #include <float.h>
@@ -52,26 +56,26 @@ struct range_overlap_query {
 };
 
 static
-void bt_ctf_field_type_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_destroy(struct bt_object *);
 static
-void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *);
 static
-void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *);
 
 static
-void (* const type_destroy_funcs[])(struct bt_ctf_ref *) = {
+void (* const type_destroy_funcs[])(struct bt_ctf_field_type *) = {
 	[CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_destroy,
 	[CTF_TYPE_ENUM] =
 		bt_ctf_field_type_enumeration_destroy,
@@ -188,6 +192,105 @@ void (* const set_byte_order_funcs[])(struct bt_ctf_field_type *,
 	[CTF_TYPE_STRING] = NULL,
 };
 
+static
+struct bt_ctf_field_type *bt_ctf_field_type_integer_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_floating_point_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_structure_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_variant_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_array_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy(
+		struct bt_ctf_field_type *);
+static
+struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
+		struct bt_ctf_field_type *);
+
+static
+struct bt_ctf_field_type *(* const type_copy_funcs[])(
+		struct bt_ctf_field_type *) = {
+	[CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_copy,
+	[CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_copy,
+	[CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_copy,
+	[CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_copy,
+	[CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_copy,
+	[CTF_TYPE_ARRAY] = bt_ctf_field_type_array_copy,
+	[CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_copy,
+	[CTF_TYPE_STRING] = bt_ctf_field_type_string_copy,
+};
+
+static
+int bt_ctf_field_type_integer_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_enumeration_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_string_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_structure_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_variant_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_array_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *);
+
+static
+int (* const type_compare_funcs[])(struct bt_ctf_field_type *,
+		struct bt_ctf_field_type *) = {
+	[CTF_TYPE_INTEGER] = bt_ctf_field_type_integer_compare,
+	[CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_compare,
+	[CTF_TYPE_FLOAT] = bt_ctf_field_type_floating_point_compare,
+	[CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_compare,
+	[CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_compare,
+	[CTF_TYPE_ARRAY] = bt_ctf_field_type_array_compare,
+	[CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_compare,
+	[CTF_TYPE_STRING] = bt_ctf_field_type_string_compare,
+};
+
+static
+int bt_ctf_field_type_enumeration_validate(struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_structure_validate(struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_array_validate(struct bt_ctf_field_type *);
+static
+int bt_ctf_field_type_sequence_validate(struct bt_ctf_field_type *);
+
+static
+int (* const type_validate_funcs[])(struct bt_ctf_field_type *) = {
+	[CTF_TYPE_INTEGER] = NULL,
+	[CTF_TYPE_FLOAT] = NULL,
+	[CTF_TYPE_STRING] = NULL,
+	[CTF_TYPE_ENUM] = bt_ctf_field_type_enumeration_validate,
+	[CTF_TYPE_STRUCT] = bt_ctf_field_type_structure_validate,
+	[CTF_TYPE_VARIANT] = bt_ctf_field_type_variant_validate,
+	[CTF_TYPE_ARRAY] = bt_ctf_field_type_array_validate,
+	[CTF_TYPE_SEQUENCE] = bt_ctf_field_type_sequence_validate,
+};
+
 static
 void destroy_enumeration_mapping(struct enumeration_mapping *mapping)
 {
@@ -197,10 +300,7 @@ void destroy_enumeration_mapping(struct enumeration_mapping *mapping)
 static
 void destroy_structure_field(struct structure_field *field)
 {
-	if (field->type) {
-		bt_ctf_field_type_put(field->type);
-	}
-
+	bt_put(field->type);
 	g_free(field);
 }
 
@@ -253,19 +353,23 @@ gint compare_enumeration_mappings_unsigned(struct enumeration_mapping **a,
 }
 
 static
-void bt_ctf_field_type_init(struct bt_ctf_field_type *type)
+void bt_ctf_field_type_init(struct bt_ctf_field_type *type, int init_bo)
 {
 	enum ctf_type_id type_id = type->declaration->id;
-	int ret;
 
 	assert(type && (type_id > CTF_TYPE_UNKNOWN) &&
 		(type_id < NR_CTF_TYPES));
 
-	bt_ctf_ref_init(&type->ref_count);
+	bt_object_init(type, bt_ctf_field_type_destroy);
 	type->freeze = type_freeze_funcs[type_id];
 	type->serialize = type_serialize_funcs[type_id];
-	ret = bt_ctf_field_type_set_byte_order(type, BT_CTF_BYTE_ORDER_NATIVE);
-	assert(!ret);
+
+	if (init_bo) {
+		int ret = bt_ctf_field_type_set_byte_order(type,
+			BT_CTF_BYTE_ORDER_NATIVE);
+		assert(!ret);
+	}
+
 	type->declaration->alignment = 1;
 }
 
@@ -292,7 +396,7 @@ int add_structure_field(GPtrArray *fields,
 		goto end;
 	}
 
-	bt_ctf_field_type_get(field_type);
+	bt_get(field_type);
 	field->name = name_quark;
 	field->type = field_type;
 	g_hash_table_insert(field_name_to_index,
@@ -304,52 +408,243 @@ end:
 }
 
 static
-void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_type_destroy(struct bt_object *obj)
 {
 	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 = container_of(obj, struct bt_ctf_field_type, base);
 	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](type);
+}
+
+static
+int bt_ctf_field_type_enumeration_validate(struct bt_ctf_field_type *type)
+{
+	int ret = 0;
+
+	struct bt_ctf_field_type_enumeration *enumeration =
+		container_of(type, struct bt_ctf_field_type_enumeration,
+			parent);
+	struct bt_ctf_field_type *container_type =
+		bt_ctf_field_type_enumeration_get_container_type(type);
+
+	if (!container_type) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = bt_ctf_field_type_validate(container_type);
+	if (ret) {
+		goto end;
+	}
+
+	/* Ensure enum has entries */
+	ret = enumeration->entries->len ? 0 : -1;
+
+end:
+	BT_PUT(container_type);
+	return ret;
+}
+
+static
+int bt_ctf_field_type_sequence_validate(struct bt_ctf_field_type *type)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *element_type = NULL;
+	struct bt_ctf_field_type_sequence *sequence =
+		container_of(type, struct bt_ctf_field_type_sequence,
+		parent);
+
+	/* Length field name should be set at this point */
+	if (sequence->length_field_name->len == 0) {
+		ret = -1;
+		goto end;
+	}
+
+	element_type = bt_ctf_field_type_sequence_get_element_type(type);
+	if (!element_type) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = bt_ctf_field_type_validate(element_type);
+
+end:
+	BT_PUT(element_type);
+
+	return ret;
+}
+
+static
+int bt_ctf_field_type_array_validate(struct bt_ctf_field_type *type)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *element_type = NULL;
+
+	element_type = bt_ctf_field_type_array_get_element_type(type);
+	if (!element_type) {
+		ret = -1;
+		goto end;
+	}
+
+	ret = bt_ctf_field_type_validate(element_type);
+
+end:
+	BT_PUT(element_type);
+
+	return ret;
+}
+
+static
+int bt_ctf_field_type_structure_validate(struct bt_ctf_field_type *type)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *child_type = NULL;
+	int field_count = bt_ctf_field_type_structure_get_field_count(type);
+	int i;
+
+	if (field_count < 0) {
+		ret = -1;
+		goto end;
+	}
+
+	for (i = 0; i < field_count; ++i) {
+		ret = bt_ctf_field_type_structure_get_field(type,
+			NULL, &child_type, i);
+		if (ret) {
+			goto end;
+		}
+
+		ret = bt_ctf_field_type_validate(child_type);
+		if (ret) {
+			goto end;
+		}
+
+		BT_PUT(child_type);
+	}
+
+end:
+	BT_PUT(child_type);
+
+	return ret;
+}
+
+static
+int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *type)
+{
+	int ret = 0;
+	int field_count;
+	struct bt_ctf_field_type *child_type = NULL;
+	struct bt_ctf_field_type_variant *variant =
+		container_of(type, struct bt_ctf_field_type_variant,
+			parent);
+	int i;
+	int tag_mappings_count;
+
+	if (variant->tag_name->len == 0 || !variant->tag) {
+		ret = -1;
+		goto end;
+	}
+
+	tag_mappings_count =
+		bt_ctf_field_type_enumeration_get_mapping_count(
+			(struct bt_ctf_field_type *) variant->tag);
+
+	if (tag_mappings_count != variant->fields->len) {
+		ret = -1;
+		goto end;
+	}
+
+	for (i = 0; i < tag_mappings_count; ++i) {
+		const char *label;
+		int64_t range_start, range_end;
+		struct bt_ctf_field_type *ft;
+
+		ret = bt_ctf_field_type_enumeration_get_mapping(
+			(struct bt_ctf_field_type *) variant->tag,
+			i, &label, &range_start, &range_end);
+		if (ret) {
+			goto end;
+		}
+		if (!label) {
+			ret = -1;
+			goto end;
+		}
+
+		ft = bt_ctf_field_type_variant_get_field_type_by_name(
+			type, label);
+		if (!ft) {
+			ret = -1;
+			goto end;
+		}
+
+		BT_PUT(ft);
+	}
+
+	field_count = bt_ctf_field_type_variant_get_field_count(type);
+	if (field_count < 0) {
+		ret = -1;
+		goto end;
+	}
+
+	for (i = 0; i < field_count; ++i) {
+		ret = bt_ctf_field_type_variant_get_field(type,
+			NULL, &child_type, i);
+		if (ret) {
+			goto end;
+		}
+
+		ret = bt_ctf_field_type_validate(child_type);
+		if (ret) {
+			goto end;
+		}
+
+		BT_PUT(child_type);
 	}
-	type_destroy_funcs[type_id](ref);
+
+end:
+	BT_PUT(child_type);
+
+	return ret;
 }
 
+/*
+ * This function validates a given field type without considering
+ * where this field type is located. It only validates the properties
+ * of the given field type and the properties of its children if
+ * applicable.
+ */
 BT_HIDDEN
 int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 {
 	int ret = 0;
+	enum ctf_type_id id = bt_ctf_field_type_get_type_id(type);
 
 	if (!type) {
 		ret = -1;
 		goto end;
 	}
 
-	switch (type->declaration->id) {
-	case CTF_TYPE_ENUM:
-	{
-		struct bt_ctf_field_type_enumeration *enumeration =
-			container_of(type, struct bt_ctf_field_type_enumeration,
-			parent);
+	if (type->valid) {
+		/* Already marked as valid */
+		goto end;
+	}
 
-		/* Ensure enum has entries */
-		ret = enumeration->entries->len ? 0 : -1;
-		break;
+	if (type_validate_funcs[id]) {
+		ret = type_validate_funcs[id](type);
 	}
-	default:
-		break;
+
+	if (!ret && type->frozen) {
+		/* Field type is valid */
+		type->valid = 1;
 	}
+
 end:
 	return ret;
 }
@@ -368,7 +663,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_integer_create(unsigned int size)
 	integer->declaration.len = size;
 	integer->declaration.base = BT_CTF_INTEGER_BASE_DECIMAL;
 	integer->declaration.encoding = CTF_STRING_NONE;
-	bt_ctf_field_type_init(&integer->parent);
+	bt_ctf_field_type_init(&integer->parent, TRUE);
 	return &integer->parent;
 }
 
@@ -515,9 +810,7 @@ struct bt_ctf_clock *bt_ctf_field_type_integer_get_mapped_clock(
 
 	integer = container_of(type, struct bt_ctf_field_type_integer, parent);
 	clock = integer->mapped_clock;
-	if (clock) {
-		bt_ctf_clock_get(clock);
-	}
+	bt_get(clock);
 end:
 	return clock;
 }
@@ -535,14 +828,8 @@ int bt_ctf_field_type_integer_set_mapped_clock(
 	}
 
 	integer = container_of(type, struct bt_ctf_field_type_integer, parent);
-	if (integer->mapped_clock) {
-		bt_ctf_clock_put(integer->mapped_clock);
-	}
-
-	if (clock) {
-		bt_ctf_clock_get(clock);
-	}
-
+	bt_put(integer->mapped_clock);
+	bt_get(clock);
 	integer->mapped_clock = clock;
 end:
 	return ret;
@@ -568,11 +855,11 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
 
 	enumeration->parent.declaration = &enumeration->declaration.p;
 	enumeration->parent.declaration->id = CTF_TYPE_ENUM;
-	bt_ctf_field_type_get(integer_container_type);
+	bt_get(integer_container_type);
 	enumeration->container = integer_container_type;
 	enumeration->entries = g_ptr_array_new_with_free_func(
 		(GDestroyNotify)destroy_enumeration_mapping);
-	bt_ctf_field_type_init(&enumeration->parent);
+	bt_ctf_field_type_init(&enumeration->parent, FALSE);
 	return &enumeration->parent;
 error:
 	g_free(enumeration);
@@ -596,7 +883,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_get_container_type(
 	enumeration_type = container_of(type,
 		struct bt_ctf_field_type_enumeration, parent);
 	container_type = enumeration_type->container;
-	bt_ctf_field_type_get(container_type);
+	bt_get(container_type);
 end:
 	return container_type;
 }
@@ -977,7 +1264,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_floating_point_create(void)
 	floating_point->mantissa.p.alignment = 1;
 	floating_point->exp.p.alignment = 1;
 
-	bt_ctf_field_type_init(&floating_point->parent);
+	bt_ctf_field_type_init(&floating_point->parent, TRUE);
 end:
 	return floating_point ? &floating_point->parent : NULL;
 }
@@ -1088,7 +1375,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_create(void)
 	structure->fields = g_ptr_array_new_with_free_func(
 		(GDestroyNotify)destroy_structure_field);
 	structure->field_name_to_index = g_hash_table_new(NULL, NULL);
-	bt_ctf_field_type_init(&structure->parent);
+	bt_ctf_field_type_init(&structure->parent, TRUE);
 	return &structure->parent;
 error:
 	return NULL;
@@ -1103,8 +1390,7 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
 
 	if (!type || !field_type || type->frozen ||
 		bt_ctf_validate_identifier(field_name) ||
-		(type->declaration->id != CTF_TYPE_STRUCT) ||
-		bt_ctf_field_type_validate(field_type)) {
+		(type->declaration->id != CTF_TYPE_STRUCT)) {
 		ret = -1;
 		goto end;
 	}
@@ -1116,11 +1402,6 @@ int bt_ctf_field_type_structure_add_field(struct bt_ctf_field_type *type,
 		ret = -1;
 		goto end;
 	}
-
-	if (type->declaration->alignment < field_type->declaration->alignment) {
-		type->declaration->alignment =
-			field_type->declaration->alignment;
-	}
 end:
 	return ret;
 }
@@ -1151,8 +1432,7 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type,
 	struct structure_field *field;
 	int ret = 0;
 
-	if (!type || index < 0 || !field_name || !field_type ||
-		(type->declaration->id != CTF_TYPE_STRUCT)) {
+	if (!type || index < 0 || (type->declaration->id != CTF_TYPE_STRUCT)) {
 		ret = -1;
 		goto end;
 	}
@@ -1165,9 +1445,13 @@ int bt_ctf_field_type_structure_get_field(struct bt_ctf_field_type *type,
 	}
 
 	field = g_ptr_array_index(structure->fields, index);
-	*field_type = field->type;
-	bt_ctf_field_type_get(field->type);
-	*field_name = g_quark_to_string(field->name);
+	if (field_type) {
+		*field_type = field->type;
+		bt_get(field->type);
+	}
+	if (field_name) {
+		*field_name = g_quark_to_string(field->name);
+	}
 end:
 	return ret;
 }
@@ -1200,7 +1484,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_get_field_type_by_name(
 
 	field = structure->fields->pdata[index];
 	field_type = field->type;
-	bt_ctf_field_type_get(field_type);
+	bt_get(field_type);
 end:
 	return field_type;
 }
@@ -1224,14 +1508,16 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
 	variant->tag_name = g_string_new(tag_name);
 	variant->field_name_to_index = g_hash_table_new(NULL, NULL);
 	variant->fields = g_ptr_array_new_with_free_func(
-		(GDestroyNotify)destroy_structure_field);
+		(GDestroyNotify) destroy_structure_field);
 	if (enum_tag) {
-		bt_ctf_field_type_get(enum_tag);
+		bt_get(enum_tag);
 		variant->tag = container_of(enum_tag,
 			struct bt_ctf_field_type_enumeration, parent);
 	}
 
-	bt_ctf_field_type_init(&variant->parent);
+	bt_ctf_field_type_init(&variant->parent, TRUE);
+	/* A variant's alignment is undefined */
+	variant->parent.declaration->alignment = 0;
 	return &variant->parent;
 error:
 	return NULL;
@@ -1253,7 +1539,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type(
 	}
 
 	tag_type = &variant->tag->parent;
-	bt_ctf_field_type_get(tag_type);
+	bt_get(tag_type);
 end:
 	return tag_type;
 }
@@ -1278,6 +1564,25 @@ end:
 	return tag_name;
 }
 
+int bt_ctf_field_type_variant_set_tag_name(
+		struct bt_ctf_field_type *type, const char *name)
+{
+	int ret = 0;
+	struct bt_ctf_field_type_variant *variant;
+
+	if (!type || type->frozen ||
+		(type->declaration->id != CTF_TYPE_VARIANT) ||
+		bt_ctf_validate_identifier(name)) {
+		ret = -1;
+		goto end;
+	}
+
+	variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+	g_string_assign(variant->tag_name, name);
+end:
+	return ret;
+}
+
 int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
 		struct bt_ctf_field_type *field_type,
 		const char *field_name)
@@ -1289,8 +1594,7 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
 
 	if (!type || !field_type || type->frozen ||
 		bt_ctf_validate_identifier(field_name) ||
-		(type->declaration->id != CTF_TYPE_VARIANT) ||
-		bt_ctf_field_type_validate(field_type)) {
+		(type->declaration->id != CTF_TYPE_VARIANT)) {
 		ret = -1;
 		goto end;
 	}
@@ -1355,7 +1659,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_by_name(
 
 	field = g_ptr_array_index(variant->fields, index);
 	field_type = field->type;
-	bt_ctf_field_type_get(field_type);
+	bt_get(field_type);
 end:
 	return field_type;
 }
@@ -1409,8 +1713,7 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type,
 	struct structure_field *field;
 	int ret = 0;
 
-	if (!type || index < 0 || !field_name || !field_type ||
-		(type->declaration->id != CTF_TYPE_VARIANT)) {
+	if (!type || index < 0 || (type->declaration->id != CTF_TYPE_VARIANT)) {
 		ret = -1;
 		goto end;
 	}
@@ -1423,9 +1726,13 @@ int bt_ctf_field_type_variant_get_field(struct bt_ctf_field_type *type,
 	}
 
 	field = g_ptr_array_index(variant->fields, index);
-	*field_type = field->type;
-	bt_ctf_field_type_get(field->type);
-	*field_name = g_quark_to_string(field->name);
+	if (field_type) {
+		*field_type = field->type;
+		bt_get(field->type);
+	}
+	if (field_name) {
+		*field_name = g_quark_to_string(field->name);
+	}
 end:
 	return ret;
 }
@@ -1436,8 +1743,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create(
 {
 	struct bt_ctf_field_type_array *array = NULL;
 
-	if (!element_type || length == 0 ||
-		bt_ctf_field_type_validate(element_type)) {
+	if (!element_type || length == 0) {
 		goto error;
 	}
 
@@ -1449,12 +1755,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create(
 	array->parent.declaration = &array->declaration.p;
 	array->parent.declaration->id = CTF_TYPE_ARRAY;
 
-	bt_ctf_field_type_get(element_type);
+	bt_get(element_type);
 	array->element_type = element_type;
 	array->length = length;
-	bt_ctf_field_type_init(&array->parent);
-	array->parent.declaration->alignment =
-		element_type->declaration->alignment;
+	bt_ctf_field_type_init(&array->parent, FALSE);
 	return &array->parent;
 error:
 	return NULL;
@@ -1472,7 +1776,33 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_get_element_type(
 
 	array = container_of(type, struct bt_ctf_field_type_array, parent);
 	ret = array->element_type;
-	bt_ctf_field_type_get(ret);
+	bt_get(ret);
+end:
+	return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_array_set_element_type(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_type *element_type)
+{
+	int ret = 0;
+	struct bt_ctf_field_type_array *array;
+
+	if (!type || !element_type ||
+			(type->declaration->id != CTF_TYPE_ARRAY)) {
+		ret = -1;
+		goto end;
+	}
+
+	array = container_of(type, struct bt_ctf_field_type_array, parent);
+
+	if (array->element_type) {
+		BT_PUT(array->element_type);
+	}
+
+	array->element_type = element_type;
+	bt_get(array->element_type);
+
 end:
 	return ret;
 }
@@ -1499,8 +1829,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
 {
 	struct bt_ctf_field_type_sequence *sequence = NULL;
 
-	if (!element_type || bt_ctf_validate_identifier(length_field_name) ||
-		bt_ctf_field_type_validate(element_type)) {
+	if (!element_type || bt_ctf_validate_identifier(length_field_name)) {
 		goto error;
 	}
 
@@ -1511,12 +1840,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
 
 	sequence->parent.declaration = &sequence->declaration.p;
 	sequence->parent.declaration->id = CTF_TYPE_SEQUENCE;
-	bt_ctf_field_type_get(element_type);
+	bt_get(element_type);
 	sequence->element_type = element_type;
 	sequence->length_field_name = g_string_new(length_field_name);
-	bt_ctf_field_type_init(&sequence->parent);
-	sequence->parent.declaration->alignment =
-		element_type->declaration->alignment;
+	bt_ctf_field_type_init(&sequence->parent, FALSE);
 	return &sequence->parent;
 error:
 	return NULL;
@@ -1535,7 +1862,33 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_get_element_type(
 	sequence = container_of(type, struct bt_ctf_field_type_sequence,
 		parent);
 	ret = sequence->element_type;
-	bt_ctf_field_type_get(ret);
+	bt_get(ret);
+end:
+	return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_sequence_set_element_type(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_type *element_type)
+{
+	int ret = 0;
+	struct bt_ctf_field_type_sequence *sequence;
+
+	if (!type || !element_type ||
+			(type->declaration->id != CTF_TYPE_SEQUENCE)) {
+		ret = -1;
+		goto end;
+	}
+
+	sequence = container_of(type, struct bt_ctf_field_type_sequence, parent);
+
+	if (sequence->element_type) {
+		BT_PUT(sequence->element_type);
+	}
+
+	sequence->element_type = element_type;
+	bt_get(sequence->element_type);
+
 end:
 	return ret;
 }
@@ -1568,7 +1921,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_create(void)
 
 	string->parent.declaration = &string->declaration.p;
 	string->parent.declaration->id = CTF_TYPE_STRING;
-	bt_ctf_field_type_init(&string->parent);
+	bt_ctf_field_type_init(&string->parent, TRUE);
 	string->declaration.encoding = CTF_STRING_UTF8;
 	string->parent.declaration->alignment = CHAR_BIT;
 	return &string->parent;
@@ -1613,24 +1966,115 @@ end:
 int bt_ctf_field_type_get_alignment(struct bt_ctf_field_type *type)
 {
 	int ret;
+	enum ctf_type_id type_id;
 
 	if (!type) {
 		ret = -1;
 		goto end;
 	}
 
-	ret = (int) type->declaration->alignment;
-end:
-	return ret;
-}
+	if (type->frozen) {
+		ret = (int) type->declaration->alignment;
+		goto end;
+	}
+
+	type_id = bt_ctf_field_type_get_type_id(type);
+	switch (type_id) {
+	case CTF_TYPE_SEQUENCE:
+	{
+		struct bt_ctf_field_type *element =
+			bt_ctf_field_type_sequence_get_element_type(type);
+
+		if (!element) {
+			ret = -1;
+			goto end;
+		}
+
+		ret = bt_ctf_field_type_get_alignment(element);
+		bt_put(element);
+		break;
+	}
+	case CTF_TYPE_ARRAY:
+	{
+		struct bt_ctf_field_type *element =
+			bt_ctf_field_type_array_get_element_type(type);
+
+		if (!element) {
+			ret = -1;
+			goto end;
+		}
+
+		ret = bt_ctf_field_type_get_alignment(element);
+		bt_put(element);
+		break;
+	}
+	case CTF_TYPE_STRUCT:
+	{
+		int i, element_count;
+
+		element_count = bt_ctf_field_type_structure_get_field_count(
+			type);
+		if (element_count < 0) {
+			ret = element_count;
+			goto end;
+		}
+
+		for (i = 0; i < element_count; i++) {
+			struct bt_ctf_field_type *field;
+			int field_alignment;
+
+			ret = bt_ctf_field_type_structure_get_field(type, NULL,
+				&field, i);
+			if (ret) {
+				goto end;
+			}
+
+			assert(field);
+			field_alignment = bt_ctf_field_type_get_alignment(
+				field);
+			bt_put(field);
+			if (field_alignment < 0) {
+				ret = field_alignment;
+				goto end;
+			}
+
+			type->declaration->alignment = MAX(field_alignment,
+				type->declaration->alignment);
+		}
+		ret = (int) type->declaration->alignment;
+		break;
+	}
+	case CTF_TYPE_UNKNOWN:
+		ret = -1;
+		break;
+	default:
+		ret = (int) type->declaration->alignment;
+		break;
+	}
+end:
+	return ret;
+}
+
+static inline
+int is_power_of_two(unsigned int value)
+{
+	return ((value & (value - 1)) == 0) && value > 0;
+}
 
 int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
 		unsigned int alignment)
 {
 	int ret = 0;
+	enum ctf_type_id type_id;
+
+	/* Alignment must be a power of two */
+	if (!type || type->frozen || !is_power_of_two(alignment)) {
+		ret = -1;
+		goto end;
+	}
 
-	/* Alignment must be bit-aligned (1) or byte aligned */
-	if (!type || type->frozen || (alignment != 1 && (alignment & 0x7))) {
+	type_id = bt_ctf_field_type_get_type_id(type);
+	if (type_id == CTF_TYPE_UNKNOWN) {
 		ret = -1;
 		goto end;
 	}
@@ -1641,6 +2085,13 @@ int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
 		goto end;
 	}
 
+	if (type_id == CTF_TYPE_VARIANT || type_id == CTF_TYPE_SEQUENCE ||
+		type_id == CTF_TYPE_ARRAY) {
+		/* Setting an alignment on these types makes no sense */
+		ret = -1;
+		goto end;
+	}
+
 	type->declaration->alignment = alignment;
 	ret = 0;
 end:
@@ -1651,7 +2102,6 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order(
 		struct bt_ctf_field_type *type)
 {
 	enum bt_ctf_byte_order ret = BT_CTF_BYTE_ORDER_UNKNOWN;
-	int internal_byte_order = -1;
 
 	if (!type) {
 		goto end;
@@ -1662,7 +2112,7 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order(
 	{
 		struct bt_ctf_field_type_integer *integer = container_of(
 			type, struct bt_ctf_field_type_integer, parent);
-		internal_byte_order = integer->declaration.byte_order;
+		ret = integer->user_byte_order;
 		break;
 	}
 	case CTF_TYPE_FLOAT:
@@ -1671,26 +2121,18 @@ enum bt_ctf_byte_order bt_ctf_field_type_get_byte_order(
 			container_of(type,
 				struct bt_ctf_field_type_floating_point,
 				parent);
-		internal_byte_order = floating_point->declaration.byte_order;
+		ret = floating_point->user_byte_order;
 		break;
 	}
 	default:
 		goto end;
 	}
 
-	switch (internal_byte_order) {
-	case LITTLE_ENDIAN:
-		ret = BT_CTF_BYTE_ORDER_LITTLE_ENDIAN;
-		break;
-	case BIG_ENDIAN:
-		ret = BT_CTF_BYTE_ORDER_BIG_ENDIAN;
-		break;
-	case 0:
-		ret = BT_CTF_BYTE_ORDER_NATIVE;
-		break;
-	default:
-		ret = BT_CTF_BYTE_ORDER_UNKNOWN;
-	}
+	assert(ret == BT_CTF_BYTE_ORDER_NATIVE ||
+		ret == BT_CTF_BYTE_ORDER_LITTLE_ENDIAN ||
+		ret == BT_CTF_BYTE_ORDER_BIG_ENDIAN ||
+		ret == BT_CTF_BYTE_ORDER_NETWORK);
+
 end:
 	return ret;
 }
@@ -1707,7 +2149,6 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
 		goto end;
 	}
 
-	type_id = type->declaration->id;
 	switch (byte_order) {
 	case BT_CTF_BYTE_ORDER_NATIVE:
 		/* Leave unset. Will be initialized by parent. */
@@ -1725,6 +2166,7 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
 		goto end;
 	}
 
+	type_id = type->declaration->id;
 	if (set_byte_order_funcs[type_id]) {
 		set_byte_order_funcs[type_id](type, internal_byte_order, 0);
 	}
@@ -1742,36 +2184,54 @@ 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)
+int bt_ctf_field_type_is_integer(struct bt_ctf_field_type *type)
 {
-	const char *name = NULL;
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_INTEGER;
+}
 
-	if (!type || !type->alias_name) {
-		goto end;
-	}
+int bt_ctf_field_type_is_floating_point(struct bt_ctf_field_type *type)
+{
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_FLOAT;
+}
 
-	name = type->alias_name->str;
-end:
-	return name;
+int bt_ctf_field_type_is_enumeration(struct bt_ctf_field_type *type)
+{
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ENUM;
 }
 
-void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
+int bt_ctf_field_type_is_string(struct bt_ctf_field_type *type)
 {
-	if (!type) {
-		return;
-	}
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRING;
+}
 
-	bt_ctf_ref_get(&type->ref_count);
+int bt_ctf_field_type_is_structure(struct bt_ctf_field_type *type)
+{
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_STRUCT;
 }
 
-void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
+int bt_ctf_field_type_is_array(struct bt_ctf_field_type *type)
 {
-	if (!type) {
-		return;
-	}
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_ARRAY;
+}
+
+int bt_ctf_field_type_is_sequence(struct bt_ctf_field_type *type)
+{
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_SEQUENCE;
+}
+
+int bt_ctf_field_type_is_variant(struct bt_ctf_field_type *type)
+{
+	return bt_ctf_field_type_get_type_id(type) == CTF_TYPE_VARIANT;
+}
+
+void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
+{
+	bt_get(type);
+}
 
-	bt_ctf_ref_put(&type->ref_count, bt_ctf_field_type_destroy);
+void bt_ctf_field_type_put(struct bt_ctf_field_type *type)
+{
+	bt_put(type);
 }
 
 BT_HIDDEN
@@ -1860,6 +2320,13 @@ int bt_ctf_field_type_serialize(struct bt_ctf_field_type *type,
 		goto end;
 	}
 
+	/* Make sure field type is valid before serializing it */
+	ret = bt_ctf_field_type_validate(type);
+
+	if (ret) {
+		goto end;
+	}
+
 	ret = type->serialize(type, context);
 end:
 	return ret;
@@ -1880,145 +2347,333 @@ void bt_ctf_field_type_set_native_byte_order(struct bt_ctf_field_type *type,
 	}
 }
 
-static
-void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type)
 {
-	struct bt_ctf_field_type_integer *integer;
+	struct bt_ctf_field_type *copy = NULL;
 
-	if (!ref) {
-		return;
+	if (!type) {
+		goto end;
 	}
 
-	integer = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_integer, parent);
-	if (integer->mapped_clock) {
-		bt_ctf_clock_put(integer->mapped_clock);
-	}
-	g_free(integer);
+	copy = type_copy_funcs[type->declaration->id](type);
+end:
+	return copy;
 }
 
-static
-void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_structure_get_field_name_index(
+		struct bt_ctf_field_type *type, const char *name)
 {
-	struct bt_ctf_field_type_enumeration *enumeration;
+	int ret;
+	size_t index;
+	GQuark name_quark;
+	struct bt_ctf_field_type_structure *structure;
 
-	if (!ref) {
-		return;
+	if (!type || !name ||
+		bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
 	}
 
-	enumeration = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_enumeration, parent);
-	g_ptr_array_free(enumeration->entries, TRUE);
-	bt_ctf_field_type_put(enumeration->container);
-	g_free(enumeration);
-}
-
-static
-void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_ref *ref)
-{
-	struct bt_ctf_field_type_floating_point *floating_point;
-
-	if (!ref) {
-		return;
+	name_quark = g_quark_try_string(name);
+	if (!name_quark) {
+		ret = -1;
+		goto end;
 	}
 
-	floating_point = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_floating_point, parent);
-	g_free(floating_point);
+	structure = container_of(type, struct bt_ctf_field_type_structure,
+		parent);
+	if (!g_hash_table_lookup_extended(structure->field_name_to_index,
+		GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+		ret = -1;
+		goto end;
+	}
+	ret = (int) index;
+end:
+	return ret;
 }
 
-static
-void bt_ctf_field_type_structure_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_structure_set_field_index(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_type *field, int index)
 {
+	int ret = 0;
 	struct bt_ctf_field_type_structure *structure;
 
-	if (!ref) {
-		return;
+	if (!type || !field ||
+		bt_ctf_field_type_get_type_id(type) != CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
 	}
 
-	structure = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_structure, parent);
-	g_ptr_array_free(structure->fields, TRUE);
-	g_hash_table_destroy(structure->field_name_to_index);
-	g_free(structure);
+	structure = container_of(type, struct bt_ctf_field_type_structure,
+		parent);
+	if (index < 0 || index >= structure->fields->len) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_get(field);
+	bt_put(((struct structure_field *)
+		g_ptr_array_index(structure->fields, index))->type);
+	((struct structure_field *) structure->fields->pdata[index])->type =
+		field;
+end:
+	return ret;
 }
 
-static
-void bt_ctf_field_type_variant_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_variant_get_field_name_index(
+		struct bt_ctf_field_type *type, const char *name)
 {
+	int ret;
+	size_t index;
+	GQuark name_quark;
 	struct bt_ctf_field_type_variant *variant;
 
-	if (!ref) {
-		return;
+	if (!type || !name ||
+		bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+		ret = -1;
+		goto end;
 	}
 
-	variant = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_variant, parent);
-	g_ptr_array_free(variant->fields, TRUE);
-	g_hash_table_destroy(variant->field_name_to_index);
-	g_string_free(variant->tag_name, TRUE);
-	bt_ctf_field_type_put(&variant->tag->parent);
-	g_free(variant);
+	name_quark = g_quark_try_string(name);
+	if (!name_quark) {
+		ret = -1;
+		goto end;
+	}
+
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+		parent);
+	if (!g_hash_table_lookup_extended(variant->field_name_to_index,
+		GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+		ret = -1;
+		goto end;
+	}
+	ret = (int) index;
+end:
+	return ret;
 }
 
-static
-void bt_ctf_field_type_array_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_sequence_set_length_field_path(
+		struct bt_ctf_field_type *type,
+		struct bt_ctf_field_path *path)
 {
-	struct bt_ctf_field_type_array *array;
+	int ret = 0;
+	struct bt_ctf_field_type_sequence *sequence;
 
-	if (!ref) {
-		return;
+	if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_SEQUENCE) {
+		ret = -1;
+		goto end;
 	}
 
-	array = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_array, parent);
-	bt_ctf_field_type_put(array->element_type);
-	g_free(array);
+	sequence = container_of(type, struct bt_ctf_field_type_sequence,
+		parent);
+	bt_get(path);
+	BT_MOVE(sequence->length_field_path, path);
+end:
+	return ret;
 }
 
-static
-void bt_ctf_field_type_sequence_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_tag_field_path(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_path *path)
 {
-	struct bt_ctf_field_type_sequence *sequence;
+	int ret = 0;
+	struct bt_ctf_field_type_variant *variant;
 
-	if (!ref) {
-		return;
+	if (!type || bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+		ret = -1;
+		goto end;
 	}
 
-	sequence = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_sequence, parent);
-	bt_ctf_field_type_put(sequence->element_type);
-	g_string_free(sequence->length_field_name, TRUE);
-	g_free(sequence);
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+		parent);
+	bt_get(path);
+	BT_MOVE(variant->tag_field_path, path);
+end:
+	return ret;
 }
 
-static
-void bt_ctf_field_type_string_destroy(struct bt_ctf_ref *ref)
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_tag_field_type(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_type *tag)
 {
-	struct bt_ctf_field_type_string *string;
+	int ret = 0;
+	struct bt_ctf_field_type_variant *variant;
 
-	if (!ref) {
-		return;
+	if (!type || !tag ||
+			bt_ctf_field_type_get_type_id(tag) != CTF_TYPE_ENUM) {
+		ret = -1;
+		goto end;
 	}
 
-	string = container_of(
-		container_of(ref, struct bt_ctf_field_type, ref_count),
-		struct bt_ctf_field_type_string, parent);
-	g_free(string);
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+		parent);
+	bt_get(tag);
+	if (variant->tag) {
+		bt_put(&variant->tag->parent);
+	}
+	variant->tag = container_of(tag, struct bt_ctf_field_type_enumeration,
+		parent);
+end:
+	return ret;
 }
 
-static
-void generic_field_type_freeze(struct bt_ctf_field_type *type)
+BT_HIDDEN
+int bt_ctf_field_type_variant_set_field_index(struct bt_ctf_field_type *type,
+		struct bt_ctf_field_type *field, int index)
 {
-	type->frozen = 1;
-}
+	int ret = 0;
+	struct bt_ctf_field_type_variant *variant;
+
+	if (!type || !field ||
+		bt_ctf_field_type_get_type_id(type) != CTF_TYPE_VARIANT) {
+		ret = -1;
+		goto end;
+	}
+
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+		parent);
+	if (index < 0 || index >= variant->fields->len) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_get(field);
+	bt_put(((struct structure_field *)
+		g_ptr_array_index(variant->fields, index))->type);
+	((struct structure_field *) variant->fields->pdata[index])->type =
+		field;
+end:
+	return ret;
+}
+
+static
+void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_integer *integer =
+		(struct bt_ctf_field_type_integer *) type;
+
+	if (!type) {
+		return;
+	}
+
+	bt_put(integer->mapped_clock);
+	g_free(integer);
+}
+
+static
+void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_enumeration *enumeration =
+		(struct bt_ctf_field_type_enumeration *) type;
+
+	if (!type) {
+		return;
+	}
+
+	g_ptr_array_free(enumeration->entries, TRUE);
+	bt_put(enumeration->container);
+	g_free(enumeration);
+}
+
+static
+void bt_ctf_field_type_floating_point_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_floating_point *floating_point =
+		(struct bt_ctf_field_type_floating_point *) type;
+
+	if (!type) {
+		return;
+	}
+
+	g_free(floating_point);
+}
+
+static
+void bt_ctf_field_type_structure_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_structure *structure =
+		(struct bt_ctf_field_type_structure *) type;
+
+	if (!type) {
+		return;
+	}
+
+	g_ptr_array_free(structure->fields, TRUE);
+	g_hash_table_destroy(structure->field_name_to_index);
+	g_free(structure);
+}
+
+static
+void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_variant *variant =
+		(struct bt_ctf_field_type_variant *) type;
+
+	if (!type) {
+		return;
+	}
+
+	g_ptr_array_free(variant->fields, TRUE);
+	g_hash_table_destroy(variant->field_name_to_index);
+	g_string_free(variant->tag_name, TRUE);
+	bt_put(&variant->tag->parent);
+	BT_PUT(variant->tag_field_path);
+	g_free(variant);
+}
+
+static
+void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_array *array =
+		(struct bt_ctf_field_type_array *) type;
+
+	if (!type) {
+		return;
+	}
+
+	bt_put(array->element_type);
+	g_free(array);
+}
+
+static
+void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_sequence *sequence =
+		(struct bt_ctf_field_type_sequence *) type;
+
+	if (!type) {
+		return;
+	}
+
+	bt_put(sequence->element_type);
+	g_string_free(sequence->length_field_name, TRUE);
+	BT_PUT(sequence->length_field_path);
+	g_free(sequence);
+}
+
+static
+void bt_ctf_field_type_string_destroy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type_string *string =
+		(struct bt_ctf_field_type_string *) type;
+
+	if (!type) {
+		return;
+	}
+
+	g_free(string);
+}
+
+static
+void generic_field_type_freeze(struct bt_ctf_field_type *type)
+{
+	type->frozen = 1;
+}
 
 static
 void bt_ctf_field_type_enumeration_freeze(struct bt_ctf_field_type *type)
@@ -2042,9 +2697,11 @@ void bt_ctf_field_type_structure_freeze(struct bt_ctf_field_type *type)
 	struct bt_ctf_field_type_structure *structure_type = container_of(
 		type, struct bt_ctf_field_type_structure, parent);
 
+	/* Cache the alignment */
+	type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
 	generic_field_type_freeze(type);
-	g_ptr_array_foreach(structure_type->fields, (GFunc)freeze_structure_field,
-		NULL);
+	g_ptr_array_foreach(structure_type->fields,
+		(GFunc) freeze_structure_field, NULL);
 }
 
 static
@@ -2054,8 +2711,8 @@ void bt_ctf_field_type_variant_freeze(struct bt_ctf_field_type *type)
 		type, struct bt_ctf_field_type_variant, parent);
 
 	generic_field_type_freeze(type);
-	g_ptr_array_foreach(variant_type->fields, (GFunc)freeze_structure_field,
-		NULL);
+	g_ptr_array_foreach(variant_type->fields,
+		(GFunc) freeze_structure_field, NULL);
 }
 
 static
@@ -2064,6 +2721,8 @@ void bt_ctf_field_type_array_freeze(struct bt_ctf_field_type *type)
 	struct bt_ctf_field_type_array *array_type = container_of(
 		type, struct bt_ctf_field_type_array, parent);
 
+	/* Cache the alignment */
+	type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
 	generic_field_type_freeze(type);
 	bt_ctf_field_type_freeze(array_type->element_type);
 }
@@ -2074,6 +2733,8 @@ void bt_ctf_field_type_sequence_freeze(struct bt_ctf_field_type *type)
 	struct bt_ctf_field_type_sequence *sequence_type = container_of(
 		type, struct bt_ctf_field_type_sequence, parent);
 
+	/* Cache the alignment */
+	type->declaration->alignment = bt_ctf_field_type_get_alignment(type);
 	generic_field_type_freeze(type);
 	bt_ctf_field_type_freeze(sequence_type->element_type);
 }
@@ -2171,11 +2832,6 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
 	struct bt_ctf_field_type *container_type;
 	int container_signed;
 
-	ret = bt_ctf_field_type_validate(type);
-	if (ret) {
-		goto end;
-	}
-
 	container_type = bt_ctf_field_type_enumeration_get_container_type(type);
 	if (!container_type) {
 		ret = -1;
@@ -2240,7 +2896,7 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
 		g_string_assign(context->field_name, "");
 	}
 error_put_container_type:
-	bt_ctf_field_type_put(container_type);
+	bt_put(container_type);
 end:
 	return ret;
 }
@@ -2435,6 +3091,33 @@ int bt_ctf_field_type_string_serialize(struct bt_ctf_field_type *type,
 	return 0;
 }
 
+static
+enum bt_ctf_byte_order get_ctf_ir_byte_order(int byte_order) {
+	enum bt_ctf_byte_order ret;
+
+	switch (byte_order) {
+	case BT_CTF_BYTE_ORDER_LITTLE_ENDIAN:
+	case LITTLE_ENDIAN:
+		ret = BT_CTF_BYTE_ORDER_LITTLE_ENDIAN;
+		break;
+	case BT_CTF_BYTE_ORDER_BIG_ENDIAN:
+	case BIG_ENDIAN:
+		ret = BT_CTF_BYTE_ORDER_BIG_ENDIAN;
+		break;
+	case BT_CTF_BYTE_ORDER_NETWORK:
+		ret = BT_CTF_BYTE_ORDER_NETWORK;
+		break;
+	case BT_CTF_BYTE_ORDER_NATIVE:
+		ret = BT_CTF_BYTE_ORDER_NATIVE;
+		break;
+	default:
+		ret = BT_CTF_BYTE_ORDER_UNKNOWN;
+		break;
+	}
+
+	return ret;
+}
+
 static
 void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *type,
 		int byte_order, int set_native)
@@ -2443,10 +3126,17 @@ void bt_ctf_field_type_integer_set_byte_order(struct bt_ctf_field_type *type,
 		struct bt_ctf_field_type_integer, parent);
 
 	if (set_native) {
-		integer_type->declaration.byte_order =
-			integer_type->declaration.byte_order == 0 ?
-			byte_order : integer_type->declaration.byte_order;
+		if (integer_type->user_byte_order == BT_CTF_BYTE_ORDER_NATIVE) {
+			/*
+			 * User byte order is native, so we can set
+			 * the real byte order.
+			 */
+			integer_type->declaration.byte_order =
+				byte_order;
+		}
 	} else {
+		integer_type->user_byte_order =
+			get_ctf_ir_byte_order(byte_order);
 		integer_type->declaration.byte_order = byte_order;
 	}
 }
@@ -2472,20 +3162,24 @@ void bt_ctf_field_type_floating_point_set_byte_order(
 		parent);
 
 	if (set_native) {
-		floating_point_type->declaration.byte_order =
-			floating_point_type->declaration.byte_order == 0 ?
-			byte_order :
-			floating_point_type->declaration.byte_order;
-		floating_point_type->sign.byte_order =
-			floating_point_type->sign.byte_order == 0 ?
-			byte_order : floating_point_type->sign.byte_order;
-		floating_point_type->mantissa.byte_order =
-			floating_point_type->mantissa.byte_order == 0 ?
-			byte_order : floating_point_type->mantissa.byte_order;
-		floating_point_type->exp.byte_order =
-			floating_point_type->exp.byte_order == 0 ?
-			byte_order : floating_point_type->exp.byte_order;
+		if (floating_point_type->user_byte_order ==
+				BT_CTF_BYTE_ORDER_NATIVE) {
+			/*
+			 * User byte order is native, so we can set
+			 * the real byte order.
+			 */
+			floating_point_type->declaration.byte_order =
+				byte_order;
+			floating_point_type->sign.byte_order =
+				byte_order;
+			floating_point_type->mantissa.byte_order =
+				byte_order;
+			floating_point_type->exp.byte_order =
+				byte_order;
+		}
 	} else {
+		floating_point_type->user_byte_order =
+			get_ctf_ir_byte_order(byte_order);
 		floating_point_type->declaration.byte_order = byte_order;
 		floating_point_type->sign.byte_order = byte_order;
 		floating_point_type->mantissa.byte_order = byte_order;
@@ -2564,3 +3258,839 @@ void bt_ctf_field_type_sequence_set_byte_order(struct bt_ctf_field_type *type,
 			sequence_type->element_type, byte_order, set_native);
 	}
 }
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_integer_copy(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy;
+	struct bt_ctf_field_type_integer *integer, *copy_integer;
+
+	integer = container_of(type, struct bt_ctf_field_type_integer, parent);
+	copy = bt_ctf_field_type_integer_create(integer->declaration.len);
+	if (!copy) {
+		goto end;
+	}
+
+	copy_integer = container_of(copy, struct bt_ctf_field_type_integer,
+		parent);
+	copy_integer->declaration = integer->declaration;
+	if (integer->mapped_clock) {
+		bt_get(integer->mapped_clock);
+		copy_integer->mapped_clock = integer->mapped_clock;
+	}
+
+	copy_integer->user_byte_order = integer->user_byte_order;
+
+end:
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy(
+		struct bt_ctf_field_type *type)
+{
+	size_t i;
+	struct bt_ctf_field_type *copy = NULL, *copy_container;
+	struct bt_ctf_field_type_enumeration *enumeration, *copy_enumeration;
+
+	enumeration = container_of(type, struct bt_ctf_field_type_enumeration,
+		parent);
+
+	/* Copy the source enumeration's container */
+	copy_container = bt_ctf_field_type_copy(enumeration->container);
+	if (!copy_container) {
+		goto end;
+	}
+
+	copy = bt_ctf_field_type_enumeration_create(copy_container);
+	if (!copy) {
+		goto end;
+	}
+	copy_enumeration = container_of(copy,
+		struct bt_ctf_field_type_enumeration, parent);
+
+	/* Copy all enumaration entries */
+	for (i = 0; i < enumeration->entries->len; i++) {
+		struct enumeration_mapping *mapping = g_ptr_array_index(
+			enumeration->entries, i);
+		struct enumeration_mapping* copy_mapping = g_new0(
+			struct enumeration_mapping, 1);
+
+		if (!copy_mapping) {
+			goto error;
+		}
+
+		*copy_mapping = *mapping;
+		g_ptr_array_add(copy_enumeration->entries, copy_mapping);
+	}
+
+	copy_enumeration->declaration = enumeration->declaration;
+end:
+	bt_put(copy_container);
+	return copy;
+error:
+	bt_put(copy_container);
+        BT_PUT(copy);
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_floating_point_copy(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy;
+	struct bt_ctf_field_type_floating_point *floating_point, *copy_float;
+
+	floating_point = container_of(type,
+		struct bt_ctf_field_type_floating_point, parent);
+	copy = bt_ctf_field_type_floating_point_create();
+	if (!copy) {
+		goto end;
+	}
+
+	copy_float = container_of(copy,
+		struct bt_ctf_field_type_floating_point, parent);
+	copy_float->declaration = floating_point->declaration;
+	copy_float->sign = floating_point->sign;
+	copy_float->mantissa = floating_point->mantissa;
+	copy_float->exp = floating_point->exp;
+	copy_float->user_byte_order = floating_point->user_byte_order;
+	copy_float->declaration.sign = &copy_float->sign;
+	copy_float->declaration.mantissa = &copy_float->mantissa;
+	copy_float->declaration.exp = &copy_float->exp;
+end:
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_structure_copy(
+		struct bt_ctf_field_type *type)
+{
+	int i;
+	GHashTableIter iter;
+	gpointer key, value;
+	struct bt_ctf_field_type *copy;
+	struct bt_ctf_field_type_structure *structure, *copy_structure;
+
+	structure = container_of(type, struct bt_ctf_field_type_structure,
+		parent);
+	copy = bt_ctf_field_type_structure_create();
+	if (!copy) {
+		goto end;
+	}
+
+	copy_structure = container_of(copy,
+		struct bt_ctf_field_type_structure, parent);
+
+	/* Copy field_name_to_index */
+	g_hash_table_iter_init(&iter, structure->field_name_to_index);
+	while (g_hash_table_iter_next (&iter, &key, &value)) {
+		g_hash_table_insert(copy_structure->field_name_to_index,
+			key, value);
+	}
+
+	for (i = 0; i < structure->fields->len; i++) {
+		struct structure_field *entry, *copy_entry;
+		struct bt_ctf_field_type *copy_field;
+
+		copy_entry = g_new0(struct structure_field, 1);
+		if (!copy_entry) {
+			goto error;
+		}
+
+		entry = g_ptr_array_index(structure->fields, i);
+		copy_field = bt_ctf_field_type_copy(entry->type);
+		if (!copy_field) {
+			g_free(copy_entry);
+			goto error;
+		}
+
+		copy_entry->name = entry->name;
+		copy_entry->type = copy_field;
+		g_ptr_array_add(copy_structure->fields, copy_entry);
+	}
+
+	copy_structure->declaration = structure->declaration;
+end:
+	return copy;
+error:
+        BT_PUT(copy);
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_variant_copy(
+		struct bt_ctf_field_type *type)
+{
+	int i;
+	GHashTableIter iter;
+	gpointer key, value;
+	struct bt_ctf_field_type *copy = NULL, *copy_tag = NULL;
+	struct bt_ctf_field_type_variant *variant, *copy_variant;
+
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+		parent);
+	if (variant->tag) {
+		copy_tag = bt_ctf_field_type_copy(&variant->tag->parent);
+		if (!copy_tag) {
+			goto end;
+		}
+	}
+
+	copy = bt_ctf_field_type_variant_create(copy_tag,
+		variant->tag_name->len ? variant->tag_name->str : NULL);
+	if (!copy) {
+		goto end;
+	}
+
+	copy_variant = container_of(copy, struct bt_ctf_field_type_variant,
+		parent);
+
+	/* Copy field_name_to_index */
+	g_hash_table_iter_init(&iter, variant->field_name_to_index);
+	while (g_hash_table_iter_next (&iter, &key, &value)) {
+		g_hash_table_insert(copy_variant->field_name_to_index,
+			key, value);
+	}
+
+	for (i = 0; i < variant->fields->len; i++) {
+		struct structure_field *entry, *copy_entry;
+		struct bt_ctf_field_type *copy_field;
+
+		copy_entry = g_new0(struct structure_field, 1);
+		if (!copy_entry) {
+			goto error;
+		}
+
+		entry = g_ptr_array_index(variant->fields, i);
+		copy_field = bt_ctf_field_type_copy(entry->type);
+		if (!copy_field) {
+			g_free(copy_entry);
+			goto error;
+		}
+
+		copy_entry->name = entry->name;
+		copy_entry->type = copy_field;
+		g_ptr_array_add(copy_variant->fields, copy_entry);
+	}
+
+	copy_variant->declaration = variant->declaration;
+	if (variant->tag_field_path) {
+		copy_variant->tag_field_path = bt_ctf_field_path_copy(
+			variant->tag_field_path);
+		if (!copy_variant->tag_field_path) {
+			goto error;
+		}
+	}
+end:
+	bt_put(copy_tag);
+	return copy;
+error:
+	bt_put(copy_tag);
+        BT_PUT(copy);
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_array_copy(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy = NULL, *copy_element;
+	struct bt_ctf_field_type_array *array, *copy_array;
+
+	array = container_of(type, struct bt_ctf_field_type_array,
+		parent);
+	copy_element = bt_ctf_field_type_copy(array->element_type);
+	if (!copy_element) {
+		goto end;
+	}
+
+	copy = bt_ctf_field_type_array_create(copy_element, array->length);
+	if (!copy) {
+		goto end;
+	}
+
+	copy_array = container_of(copy, struct bt_ctf_field_type_array,
+		parent);
+	copy_array->declaration = array->declaration;
+end:
+	bt_put(copy_element);
+	return copy;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy = NULL, *copy_element;
+	struct bt_ctf_field_type_sequence *sequence, *copy_sequence;
+
+	sequence = container_of(type, struct bt_ctf_field_type_sequence,
+		parent);
+	copy_element = bt_ctf_field_type_copy(sequence->element_type);
+	if (!copy_element) {
+		goto end;
+	}
+
+	copy = bt_ctf_field_type_sequence_create(copy_element,
+		sequence->length_field_name->len ?
+			sequence->length_field_name->str : NULL);
+	if (!copy) {
+		goto end;
+	}
+
+	copy_sequence = container_of(copy, struct bt_ctf_field_type_sequence,
+		parent);
+	copy_sequence->declaration = sequence->declaration;
+	if (sequence->length_field_path) {
+		copy_sequence->length_field_path = bt_ctf_field_path_copy(
+			sequence->length_field_path);
+		if (!copy_sequence->length_field_path) {
+			goto error;
+		}
+	}
+end:
+	bt_put(copy_element);
+	return copy;
+error:
+	BT_PUT(copy);
+	goto end;
+}
+
+static
+struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy;
+	struct bt_ctf_field_type_string *string, *copy_string;
+
+	copy = bt_ctf_field_type_string_create();
+	if (!copy) {
+		goto end;
+	}
+
+	string = container_of(type, struct bt_ctf_field_type_string,
+		parent);
+	copy_string = container_of(type, struct bt_ctf_field_type_string,
+		parent);
+	copy_string->declaration = string->declaration;
+end:
+	return copy;
+}
+
+static
+int bt_ctf_field_type_integer_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	struct bt_ctf_field_type_integer *integer_a;
+	struct bt_ctf_field_type_integer *integer_b;
+	struct declaration_integer *decl_a;
+	struct declaration_integer *decl_b;
+
+	integer_a = container_of(type_a, struct bt_ctf_field_type_integer,
+		parent);
+	integer_b = container_of(type_b, struct bt_ctf_field_type_integer,
+		parent);
+	decl_a = &integer_a->declaration;
+	decl_b = &integer_b->declaration;
+
+	/* Length */
+	if (decl_a->len != decl_b->len) {
+		goto end;
+	}
+
+	/*
+	 * Compare user byte orders only, not the cached,
+	 * real byte orders.
+	 */
+	if (integer_a->user_byte_order != integer_b->user_byte_order) {
+		goto end;
+	}
+
+	/* Signedness */
+	if (decl_a->signedness != decl_b->signedness) {
+		goto end;
+	}
+
+	/* Base */
+	if (decl_a->base != decl_b->base) {
+		goto end;
+	}
+
+	/* Encoding */
+	if (decl_a->encoding != decl_b->encoding) {
+		goto end;
+	}
+
+	/* Mapped clock */
+	if (integer_a->mapped_clock != integer_b->mapped_clock) {
+		goto end;
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	struct bt_ctf_field_type_floating_point *float_a;
+	struct bt_ctf_field_type_floating_point *float_b;
+
+	float_a = container_of(type_a,
+		struct bt_ctf_field_type_floating_point, parent);
+	float_b = container_of(type_b,
+		struct bt_ctf_field_type_floating_point, parent);
+
+	/* Sign length */
+	if (float_a->sign.len != float_b->sign.len) {
+		goto end;
+	}
+
+	/* Exponent length */
+	if (float_a->exp.len != float_b->exp.len) {
+		goto end;
+	}
+
+	/* Mantissa length */
+	if (float_a->mantissa.len != float_b->mantissa.len) {
+		goto end;
+	}
+
+	/*
+	 * Compare user byte orders only, not the cached,
+	 * real byte orders.
+	 */
+	if (float_a->user_byte_order != float_b->user_byte_order) {
+		goto end;
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int compare_enumeration_mappings(struct enumeration_mapping *mapping_a,
+		struct enumeration_mapping *mapping_b)
+{
+	int ret = 1;
+
+	/* Label */
+	if (mapping_a->string != mapping_b->string) {
+		goto end;
+	}
+
+	/* Range start */
+	if (mapping_a->range_start._unsigned !=
+			mapping_b->range_start._unsigned) {
+		goto end;
+	}
+
+	/* Range end */
+	if (mapping_a->range_end._unsigned !=
+			mapping_b->range_end._unsigned) {
+		goto end;
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_enumeration_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	int i;
+	struct bt_ctf_field_type_enumeration *enum_a;
+	struct bt_ctf_field_type_enumeration *enum_b;
+
+	enum_a = container_of(type_a,
+		struct bt_ctf_field_type_enumeration, parent);
+	enum_b = container_of(type_b,
+		struct bt_ctf_field_type_enumeration, parent);
+
+	/* Container field type */
+	ret = bt_ctf_field_type_compare(enum_a->container, enum_b->container);
+	if (ret) {
+		goto end;
+	}
+
+	ret = 1;
+
+	/* Entries */
+	if (enum_a->entries->len != enum_b->entries->len) {
+		goto end;
+	}
+
+	for (i = 0; i < enum_a->entries->len; ++i) {
+		struct enumeration_mapping *mapping_a =
+			g_ptr_array_index(enum_a->entries, i);
+		struct enumeration_mapping *mapping_b =
+			g_ptr_array_index(enum_b->entries, i);
+
+		if (compare_enumeration_mappings(mapping_a, mapping_b)) {
+			goto end;
+		}
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_string_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	struct bt_ctf_field_type_string *string_a;
+	struct bt_ctf_field_type_string *string_b;
+
+	string_a = container_of(type_a,
+		struct bt_ctf_field_type_string, parent);
+	string_b = container_of(type_b,
+		struct bt_ctf_field_type_string, parent);
+
+	/* Encoding */
+	if (string_a->declaration.encoding != string_b->declaration.encoding) {
+		goto end;
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int compare_structure_fields(struct structure_field *field_a,
+		struct structure_field *field_b)
+{
+	int ret = 1;
+
+	/* Label */
+	if (field_a->name != field_b->name) {
+		goto end;
+	}
+
+	/* Type */
+	ret = bt_ctf_field_type_compare(field_a->type, field_b->type);
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_structure_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	int i;
+	struct bt_ctf_field_type_structure *struct_a;
+	struct bt_ctf_field_type_structure *struct_b;
+
+	struct_a = container_of(type_a,
+		struct bt_ctf_field_type_structure, parent);
+	struct_b = container_of(type_b,
+		struct bt_ctf_field_type_structure, parent);
+
+	/* Alignment */
+	if (bt_ctf_field_type_get_alignment(type_a) !=
+			bt_ctf_field_type_get_alignment(type_b)) {
+		goto end;
+	}
+
+	/* Fields */
+	if (struct_a->fields->len != struct_b->fields->len) {
+		goto end;
+	}
+
+	for (i = 0; i < struct_a->fields->len; ++i) {
+		struct structure_field *field_a =
+			g_ptr_array_index(struct_a->fields, i);
+		struct structure_field *field_b =
+			g_ptr_array_index(struct_b->fields, i);
+
+		ret = compare_structure_fields(field_a, field_b);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_variant_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	int i;
+	struct bt_ctf_field_type_variant *variant_a;
+	struct bt_ctf_field_type_variant *variant_b;
+
+	variant_a = container_of(type_a,
+		struct bt_ctf_field_type_variant, parent);
+	variant_b = container_of(type_b,
+		struct bt_ctf_field_type_variant, parent);
+
+	/* Tag name */
+	if (strcmp(variant_a->tag_name->str, variant_b->tag_name->str)) {
+		goto end;
+	}
+
+	/* Tag type */
+	ret = bt_ctf_field_type_compare(
+		(struct bt_ctf_field_type *) variant_a->tag,
+		(struct bt_ctf_field_type *) variant_b->tag);
+	if (ret) {
+		goto end;
+	}
+
+	ret = 1;
+
+	/* Fields */
+	if (variant_a->fields->len != variant_b->fields->len) {
+		goto end;
+	}
+
+	for (i = 0; i < variant_a->fields->len; ++i) {
+		struct structure_field *field_a =
+			g_ptr_array_index(variant_a->fields, i);
+		struct structure_field *field_b =
+			g_ptr_array_index(variant_b->fields, i);
+
+		ret = compare_structure_fields(field_a, field_b);
+		if (ret) {
+			goto end;
+		}
+	}
+
+	/* Equal */
+	ret = 0;
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_array_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+	struct bt_ctf_field_type_array *array_a;
+	struct bt_ctf_field_type_array *array_b;
+
+	array_a = container_of(type_a,
+		struct bt_ctf_field_type_array, parent);
+	array_b = container_of(type_b,
+		struct bt_ctf_field_type_array, parent);
+
+	/* Length */
+	if (array_a->length != array_b->length) {
+		goto end;
+	}
+
+	/* Element type */
+	ret = bt_ctf_field_type_compare(array_a->element_type,
+		array_b->element_type);
+
+end:
+	return ret;
+}
+
+static
+int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = -1;
+	struct bt_ctf_field_type_sequence *sequence_a;
+	struct bt_ctf_field_type_sequence *sequence_b;
+
+	sequence_a = container_of(type_a,
+		struct bt_ctf_field_type_sequence, parent);
+	sequence_b = container_of(type_b,
+		struct bt_ctf_field_type_sequence, parent);
+
+	/* Length name */
+	if (strcmp(sequence_a->length_field_name->str,
+			sequence_b->length_field_name->str)) {
+		goto end;
+	}
+
+	/* Element type */
+	ret = bt_ctf_field_type_compare(sequence_a->element_type,
+			sequence_b->element_type);
+
+end:
+	return ret;
+}
+
+int bt_ctf_field_type_compare(struct bt_ctf_field_type *type_a,
+		struct bt_ctf_field_type *type_b)
+{
+	int ret = 1;
+
+	if (type_a == type_b) {
+		/* Same reference: equal (even if both are NULL) */
+		ret = 0;
+		goto end;
+	}
+
+	if (!type_a || !type_b) {
+		ret = -1;
+		goto end;
+	}
+
+	if (type_a->declaration->id != type_b->declaration->id) {
+		/* Different type IDs */
+		goto end;
+	}
+
+	if (type_a->declaration->id == CTF_TYPE_UNKNOWN) {
+		/* Both have unknown type IDs */
+		goto end;
+	}
+
+	ret = type_compare_funcs[type_a->declaration->id](type_a, type_b);
+
+end:
+	return ret;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_get_field_count(struct bt_ctf_field_type *field_type)
+{
+	int field_count = -1;
+	enum ctf_type_id type_id = bt_ctf_field_type_get_type_id(field_type);
+
+	switch (type_id) {
+	case CTF_TYPE_STRUCT:
+		field_count =
+			bt_ctf_field_type_structure_get_field_count(field_type);
+		break;
+	case CTF_TYPE_VARIANT:
+		field_count =
+			bt_ctf_field_type_variant_get_field_count(field_type);
+		break;
+	case CTF_TYPE_ARRAY:
+	case CTF_TYPE_SEQUENCE:
+		/*
+		 * Array and sequence types always contain a single member
+		 * (the element type).
+		 */
+		field_count = 1;
+		break;
+	default:
+		break;
+	}
+
+	return field_count;
+}
+
+BT_HIDDEN
+struct bt_ctf_field_type *bt_ctf_field_type_get_field_at_index(
+		struct bt_ctf_field_type *field_type, int index)
+{
+	struct bt_ctf_field_type *field = NULL;
+	enum ctf_type_id type_id = bt_ctf_field_type_get_type_id(field_type);
+
+	switch (type_id) {
+	case CTF_TYPE_STRUCT:
+		bt_ctf_field_type_structure_get_field(field_type, NULL, &field,
+			index);
+		break;
+	case CTF_TYPE_VARIANT:
+		bt_ctf_field_type_variant_get_field(field_type, NULL,
+			&field, index);
+		break;
+	case CTF_TYPE_ARRAY:
+		field = bt_ctf_field_type_array_get_element_type(field_type);
+		break;
+	case CTF_TYPE_SEQUENCE:
+		field = bt_ctf_field_type_sequence_get_element_type(field_type);
+		break;
+	default:
+		break;
+	}
+
+	return field;
+}
+
+BT_HIDDEN
+int bt_ctf_field_type_get_field_index(struct bt_ctf_field_type *field_type,
+		const char *name)
+{
+	int field_index = -1;
+	enum ctf_type_id type_id = bt_ctf_field_type_get_type_id(field_type);
+
+	switch (type_id) {
+	case CTF_TYPE_STRUCT:
+		field_index = bt_ctf_field_type_structure_get_field_name_index(
+			field_type, name);
+		break;
+	case CTF_TYPE_VARIANT:
+		field_index = bt_ctf_field_type_variant_get_field_name_index(
+			field_type, name);
+		break;
+	default:
+		break;
+	}
+
+	return field_index;
+}
+
+struct bt_ctf_field_path *bt_ctf_field_type_variant_get_tag_field_path(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_path *field_path = NULL;
+	struct bt_ctf_field_type_variant *variant;
+
+	if (!type || !bt_ctf_field_type_is_variant(type)) {
+		goto end;
+	}
+
+	variant = container_of(type, struct bt_ctf_field_type_variant,
+			parent);
+	field_path = bt_get(variant->tag_field_path);
+end:
+	return field_path;
+}
+
+struct bt_ctf_field_path *bt_ctf_field_type_sequence_get_length_field_path(
+		struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_path *field_path = NULL;
+	struct bt_ctf_field_type_sequence *sequence;
+
+	if (!type || !bt_ctf_field_type_is_sequence(type)) {
+		goto end;
+	}
+
+	sequence = container_of(type, struct bt_ctf_field_type_sequence,
+			parent);
+	field_path = bt_get(sequence->length_field_path);
+end:
+	return field_path;
+}