X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Ffield-types.c;h=5063ea65b87f7f8a842610d421c3923ecafb5276;hb=985100c1afeaa177d3e3ed75609ec5b1c6623ab8;hp=3e41cd69e3185d31ba523b0c0ac9f140aaa937dc;hpb=225f3384db6d41dc4dbe27e8183ebeca16c63db3;p=babeltrace.git

diff --git a/lib/ctf-ir/field-types.c b/lib/ctf-ir/field-types.c
index 3e41cd69..5063ea65 100644
--- a/lib/ctf-ir/field-types.c
+++ b/lib/ctf-ir/field-types.c
@@ -306,6 +306,14 @@ void destroy_enumeration_mapping(struct enumeration_mapping *mapping)
 static
 void destroy_structure_field(struct structure_field *field)
 {
+	if (!field) {
+		return;
+	}
+
+	BT_LOGD("Destroying structure/variant field type's field object: "
+		"addr=%p, field-ft-addr=%p, field-name=\"%s\"",
+		field, field->type, g_quark_to_string(field->name));
+	BT_LOGD_STR("Putting field type.");
 	bt_put(field->type);
 	g_free(field);
 }
@@ -397,8 +405,12 @@ void bt_ctf_field_type_init(struct bt_ctf_field_type *type, bt_bool init_bo)
 	type->serialize = type_serialize_funcs[type->id];
 
 	if (init_bo) {
-		int ret = bt_ctf_field_type_set_byte_order(type,
-			BT_CTF_BYTE_ORDER_NATIVE);
+		int ret;
+		const enum bt_ctf_byte_order bo = BT_CTF_BYTE_ORDER_NATIVE;
+
+		BT_LOGD("Setting initial field type's byte order: bo=%s",
+			bt_ctf_byte_order_string(bo));
+		ret = bt_ctf_field_type_set_byte_order(type, bo);
 		assert(ret == 0);
 	}
 
@@ -450,15 +462,10 @@ void bt_ctf_field_type_destroy(struct bt_object *obj)
 	struct bt_ctf_field_type *type;
 	enum bt_ctf_field_type_id type_id;
 
-	BT_LOGD("Destroying field type object: addr=%p", obj);
 	type = container_of(obj, struct bt_ctf_field_type, base);
 	type_id = type->id;
-	if (type_id <= BT_CTF_FIELD_TYPE_ID_UNKNOWN ||
-			type_id >= BT_CTF_NR_TYPE_IDS) {
-		BT_LOGW("Unknown field type ID: addr=%p, id=%d", obj, type_id);
-		return;
-	}
-
+	assert(type_id > BT_CTF_FIELD_TYPE_ID_UNKNOWN &&
+		type_id < BT_CTF_NR_TYPE_IDS);
 	type_destroy_funcs[type_id](type);
 }
 
@@ -690,25 +697,6 @@ bt_bool bt_ctf_field_type_enumeration_has_overlapping_ranges(
 	return enumeration_type->has_overlapping_ranges;
 }
 
-static
-int bt_ctf_field_type_enumeration_get_mapping_name(
-		struct bt_ctf_field_type *enum_field_type,
-		uint64_t index,
-		const char **mapping_name)
-{
-	int ret = 0;
-	struct enumeration_mapping *mapping;
-
-	assert(enum_field_type);
-	mapping = get_enumeration_mapping(enum_field_type, index);
-	assert(mapping);
-	if (mapping_name) {
-		*mapping_name = g_quark_to_string(mapping->string);
-	}
-
-	return ret;
-}
-
 static
 int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *type)
 {
@@ -719,7 +707,6 @@ int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *type)
 		container_of(type, struct bt_ctf_field_type_variant,
 			parent);
 	int64_t i;
-	int64_t tag_mappings_count;
 
 	if (variant->tag_name->len == 0) {
 		BT_LOGW("Invalid variant field type: no tag field name: "
@@ -746,43 +733,20 @@ int bt_ctf_field_type_variant_validate(struct bt_ctf_field_type *type)
 		goto end;
 	}
 
-	tag_mappings_count =
-		bt_ctf_field_type_enumeration_get_mapping_count(
-			(struct bt_ctf_field_type *) variant->tag);
-
 	/*
-	 * Validate that each mapping found in the tag has a name which
-	 * is also the name of a field in this variant field type.
+	 * It is valid to have a variant field type which does not have
+	 * the fields corresponding to each label in the associated
+	 * enumeration.
+	 *
+	 * It is also valid to have variant field type fields which
+	 * cannot be selected because the variant field type tag has no
+	 * mapping named as such. This scenario, while not ideal, cannot
+	 * cause any error.
 	 *
-	 * The opposite is accepted: variant FT fields which cannot be
-	 * selected because the variant FT tag has no mapping named as
-	 * such. This scenario, while not ideal, cannot cause any error.
+	 * If a non-existing field happens to be selected by an
+	 * enumeration while reading a variant field, an error will be
+	 * generated at that point (while reading the stream).
 	 */
-	for (i = 0; i < tag_mappings_count; ++i) {
-		const char *label;
-		struct bt_ctf_field_type *ft;
-
-		ret = bt_ctf_field_type_enumeration_get_mapping_name(
-			(struct bt_ctf_field_type *) variant->tag,
-			i, &label);
-		assert(ret == 0);
-		assert(label);
-		ft = bt_ctf_field_type_variant_get_field_type_by_name(
-			type, label);
-		if (!ft) {
-			BT_LOGW("Invalid variant field type: "
-				"enumeration tag field type contains a mapping which does not name a variant field type field: "
-				"variant-ft-addr=%p, tag-field-name=\"%s\", "
-				"enum-ft-addr=%p, mapping-name=\"%s\"",
-				type, variant->tag_name->str, variant->tag,
-				label);
-			ret = -1;
-			goto end;
-		}
-
-		BT_PUT(ft);
-	}
-
 	field_count = bt_ctf_field_type_variant_get_field_count(type);
 	if (field_count < 0) {
 		BT_LOGW("Invalid variant field type: no fields: "
@@ -844,6 +808,7 @@ int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 
 	if (!ret && type->frozen) {
 		/* Field type is valid */
+		BT_LOGV("Marking field type as valid: addr=%p", type);
 		type->valid = 1;
 	}
 
@@ -972,7 +937,7 @@ end:
 }
 
 int bt_ctf_field_type_integer_set_size(struct bt_ctf_field_type *type,
-		size_t size)
+		unsigned int size)
 {
 	int ret = 0;
 	struct bt_ctf_field_type_integer *integer;
@@ -1064,6 +1029,7 @@ int bt_ctf_field_type_integer_set_base(struct bt_ctf_field_type *type,
 	}
 
 	switch (base) {
+	case BT_CTF_INTEGER_BASE_UNSPECIFIED:
 	case BT_CTF_INTEGER_BASE_BINARY:
 	case BT_CTF_INTEGER_BASE_OCTAL:
 	case BT_CTF_INTEGER_BASE_DECIMAL:
@@ -1172,7 +1138,8 @@ end:
 	return clock_class;
 }
 
-int bt_ctf_field_type_integer_set_mapped_clock_class(
+BT_HIDDEN
+int bt_ctf_field_type_integer_set_mapped_clock_class_no_check(
 		struct bt_ctf_field_type *type,
 		struct bt_ctf_clock_class *clock_class)
 {
@@ -1191,10 +1158,10 @@ int bt_ctf_field_type_integer_set_mapped_clock_class(
 		goto end;
 	}
 
-	if (type->frozen) {
-		BT_LOGW("Invalid parameter: field type is frozen: addr=%p",
-			type);
-		ret = -1;
+	if (type->id != BT_CTF_FIELD_TYPE_ID_INTEGER) {
+		BT_LOGW("Invalid parameter: field type is not an integer field type: "
+			"addr=%p, ft-id=%s", type,
+			bt_ctf_field_type_id_string(type->id));
 		goto end;
 	}
 
@@ -1217,6 +1184,32 @@ end:
 	return ret;
 }
 
+int bt_ctf_field_type_integer_set_mapped_clock_class(
+		struct bt_ctf_field_type *type,
+		struct bt_ctf_clock_class *clock_class)
+{
+	int ret = 0;
+
+	if (!type) {
+		BT_LOGW_STR("Invalid parameter: field type is NULL.");
+		ret = -1;
+		goto end;
+	}
+
+	if (type->frozen) {
+		BT_LOGW("Invalid parameter: field type is frozen: addr=%p",
+			type);
+		ret = -1;
+		goto end;
+	}
+
+	ret = bt_ctf_field_type_integer_set_mapped_clock_class_no_check(
+		type, clock_class);
+
+end:
+	return ret;
+}
+
 static
 void bt_ctf_field_type_enum_iter_destroy(struct bt_object *obj)
 {
@@ -1225,6 +1218,9 @@ void bt_ctf_field_type_enum_iter_destroy(struct bt_object *obj)
 			struct bt_ctf_field_type_enumeration_mapping_iterator,
 			base);
 
+	BT_LOGD("Destroying enumeration field type mapping iterator: addr=%p",
+		obj);
+	BT_LOGD_STR("Putting parent enumeration field type.");
 	bt_put(&iter->enumeration_type->parent);
 	g_free(iter);
 }
@@ -1283,16 +1279,12 @@ bt_ctf_field_type_enumeration_find_mappings_by_name(
 
 	iter->u.name_quark = g_quark_try_string(name);
 	if (!iter->u.name_quark) {
-		BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
-		goto error;
-	}
-
-	/* Advance iterator to first entry, or leave index at -1. */
-	if (bt_ctf_field_type_enumeration_mapping_iterator_next(iter)) {
-		/* No entry found. */
-		goto error;
+		/*
+		 * No results are possible, set the iterator's position at the
+		 * end.
+		 */
+		iter->index = iter->enumeration_type->entries->len;
 	}
-
 	return iter;
 error:
 	bt_put(iter);
@@ -1349,6 +1341,8 @@ int bt_ctf_field_type_enumeration_mapping_iterator_next(
 			break;
 		}
 		default:
+			BT_LOGF("Invalid enumeration field type mapping iterator type: "
+				"type=%d", iter->type);
 			abort();
 		}
 	}
@@ -1381,13 +1375,6 @@ bt_ctf_field_type_enumeration_find_mappings_by_signed_value(
 	}
 
 	iter->u.signed_value = value;
-
-	/* Advance iterator to first entry, or leave index at -1. */
-	if (bt_ctf_field_type_enumeration_mapping_iterator_next(iter)) {
-		/* No entry found. */
-		goto error;
-	}
-
 	return iter;
 error:
 	bt_put(iter);
@@ -1398,12 +1385,7 @@ struct bt_ctf_field_type_enumeration_mapping_iterator *
 bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(
 		struct bt_ctf_field_type *type, uint64_t value)
 {
-	struct bt_ctf_field_type_enumeration_mapping_iterator *iter = NULL;
-
-	if (!type) {
-		BT_LOGW_STR("Invalid parameter: field type is NULL.");
-		goto error;
-	}
+	struct bt_ctf_field_type_enumeration_mapping_iterator *iter;
 
 	iter = bt_ctf_field_type_enumeration_find_mappings_type(
 			type, ITERATOR_BY_UNSIGNED_VALUE);
@@ -1421,13 +1403,6 @@ bt_ctf_field_type_enumeration_find_mappings_by_unsigned_value(
 		goto error;
 	}
 	iter->u.unsigned_value = value;
-
-	/* Advance iterator to first entry, or leave index at -1. */
-	if (bt_ctf_field_type_enumeration_mapping_iterator_next(iter)) {
-		/* No entry found. */
-		goto error;
-	}
-
 	return iter;
 error:
 	bt_put(iter);
@@ -1447,6 +1422,12 @@ int bt_ctf_field_type_enumeration_mapping_iterator_get_signed(
 		goto end;
 	}
 
+	if (iter->index == -1) {
+		BT_LOGW_STR("Invalid enumeration field type mapping iterator access: position=-1");
+		ret = -1;
+		goto end;
+	}
+
 	ret = bt_ctf_field_type_enumeration_get_mapping_signed(
 			&iter->enumeration_type->parent, iter->index,
 			mapping_name, range_begin, range_end);
@@ -1467,6 +1448,12 @@ int bt_ctf_field_type_enumeration_mapping_iterator_get_unsigned(
 		goto end;
 	}
 
+	if (iter->index == -1) {
+		BT_LOGW_STR("Invalid enumeration field type mapping iterator access: position=-1");
+		ret = -1;
+		goto end;
+	}
+
 	ret = bt_ctf_field_type_enumeration_get_mapping_unsigned(
 			&iter->enumeration_type->parent, iter->index,
 			mapping_name, range_begin, range_end);
@@ -1497,6 +1484,7 @@ int bt_ctf_field_type_enumeration_get_mapping_signed(
 
 	if (mapping_name) {
 		*mapping_name = g_quark_to_string(mapping->string);
+		assert(*mapping_name);
 	}
 
 	if (range_begin) {
@@ -1534,6 +1522,7 @@ int bt_ctf_field_type_enumeration_get_mapping_unsigned(
 
 	if (mapping_name) {
 		*mapping_name = g_quark_to_string(mapping->string);
+		assert(*mapping_name);
 	}
 
 	if (range_begin) {
@@ -2154,6 +2143,7 @@ int bt_ctf_field_type_structure_get_field_by_index(
 	}
 	if (field_name) {
 		*field_name = g_quark_to_string(field->name);
+		assert(*field_name);
 	}
 end:
 	return ret;
@@ -2181,14 +2171,19 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_get_field_type_by_name(
 
 	name_quark = g_quark_try_string(name);
 	if (!name_quark) {
-		BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+		BT_LOGV("No such structure field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		goto end;
 	}
 
 	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)) {
+			GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+		BT_LOGV("No such structure field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		goto end;
 	}
 
@@ -2465,13 +2460,18 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_by_name(
 
 	name_quark = g_quark_try_string(field_name);
 	if (!name_quark) {
-		BT_LOGE("Cannot get GQuark: string=\"%s\"", field_name);
+		BT_LOGV("No such variant field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, field_name);
 		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)) {
+			GUINT_TO_POINTER(name_quark), NULL, (gpointer *)&index)) {
+		BT_LOGV("No such variant field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, field_name);
 		goto end;
 	}
 
@@ -2509,7 +2509,8 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_from_tag(
 	}
 
 	iter = bt_ctf_field_enumeration_get_mappings(tag);
-	if (!iter) {
+	ret = bt_ctf_field_type_enumeration_mapping_iterator_next(iter);
+	if (!iter || ret) {
 		BT_LOGE("Cannot get enumeration field type mapping iterator from enumeration field: "
 			"enum-field-addr=%p", tag);
 		goto end;
@@ -2596,6 +2597,7 @@ int bt_ctf_field_type_variant_get_field_by_index(struct bt_ctf_field_type *type,
 	}
 	if (field_name) {
 		*field_name = g_quark_to_string(field->name);
+		assert(*field_name);
 	}
 end:
 	return ret;
@@ -3163,7 +3165,7 @@ int bt_ctf_field_type_set_byte_order(struct bt_ctf_field_type *type,
 			byte_order != BT_CTF_BYTE_ORDER_LITTLE_ENDIAN &&
 			byte_order != BT_CTF_BYTE_ORDER_BIG_ENDIAN &&
 			byte_order != BT_CTF_BYTE_ORDER_NETWORK) {
-		BT_LOGW("Invalid parameter: unknown byte order: "
+		BT_LOGW("Invalid parameter: invalid byte order: "
 			"addr=%p, bo=%s", type,
 			bt_ctf_byte_order_string(byte_order));
 		ret = -1;
@@ -3251,7 +3253,6 @@ void bt_ctf_field_type_freeze(struct bt_ctf_field_type *type)
 		return;
 	}
 
-	BT_LOGD("Freezing field type: addr=%p", type);
 	type->freeze(type);
 }
 
@@ -3279,7 +3280,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_field_type_signed(
 
 	field_name_quark = query.mapping_name;
 	if (!g_hash_table_lookup_extended(variant->field_name_to_index,
-		GUINT_TO_POINTER(field_name_quark), NULL, &index)) {
+			GUINT_TO_POINTER(field_name_quark), NULL, &index)) {
 		goto end;
 	}
 
@@ -3333,13 +3334,11 @@ int bt_ctf_field_type_serialize(struct bt_ctf_field_type *type,
 	assert(type);
 	assert(context);
 
-	BT_LOGD("Serializing field type's metadata: "
-		"ft-addr=%p, metadata-context-addr=%p", type, context);
-
 	/* Make sure field type is valid before serializing it */
 	ret = bt_ctf_field_type_validate(type);
 	if (ret) {
-		BT_LOGW_STR("Cannot serialize field type's metadata: field type is invalid.");
+		BT_LOGW("Cannot serialize field type's metadata: field type is invalid: "
+			"addr=%p", type);
 		goto end;
 	}
 
@@ -3352,8 +3351,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type)
 {
 	struct bt_ctf_field_type *copy = NULL;
 
-	BT_LOGD("Copying field type object: addr=%p", type);
-
 	if (!type) {
 		BT_LOGW_STR("Invalid parameter: field type is NULL.");
 		goto end;
@@ -3366,7 +3363,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type)
 	}
 
 	copy->alignment = type->alignment;
-	BT_LOGD("Copied field type object: copy-ft-addr=%p", copy);
 end:
 	return copy;
 }
@@ -3402,7 +3398,9 @@ int bt_ctf_field_type_structure_get_field_name_index(
 
 	name_quark = g_quark_try_string(name);
 	if (!name_quark) {
-		BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+		BT_LOGV("No such structure field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		ret = -1;
 		goto end;
 	}
@@ -3410,7 +3408,11 @@ int bt_ctf_field_type_structure_get_field_name_index(
 	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)) {
+			GUINT_TO_POINTER(name_quark),
+			NULL, (gpointer *)&index)) {
+		BT_LOGV("No such structure field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		ret = -1;
 		goto end;
 	}
@@ -3450,7 +3452,9 @@ int bt_ctf_field_type_variant_get_field_name_index(
 
 	name_quark = g_quark_try_string(name);
 	if (!name_quark) {
-		BT_LOGE("Cannot get GQuark: string=\"%s\"", name);
+		BT_LOGV("No such variant field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		ret = -1;
 		goto end;
 	}
@@ -3458,7 +3462,11 @@ int bt_ctf_field_type_variant_get_field_name_index(
 	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)) {
+			GUINT_TO_POINTER(name_quark),
+			NULL, (gpointer *)&index)) {
+		BT_LOGV("No such variant field type field name: "
+			"ft-addr=%p, field-name=\"%s\"",
+			type, name);
 		ret = -1;
 		goto end;
 	}
@@ -3582,6 +3590,7 @@ void bt_ctf_field_type_integer_destroy(struct bt_ctf_field_type *type)
 	}
 
 	BT_LOGD("Destroying integer field type object: addr=%p", type);
+	BT_LOGD_STR("Putting mapped clock class.");
 	bt_put(integer->mapped_clock);
 	g_free(integer);
 }
@@ -3598,6 +3607,7 @@ void bt_ctf_field_type_enumeration_destroy(struct bt_ctf_field_type *type)
 
 	BT_LOGD("Destroying enumeration field type object: addr=%p", type);
 	g_ptr_array_free(enumeration->entries, TRUE);
+	BT_LOGD_STR("Putting container field type.");
 	bt_put(enumeration->container);
 	g_free(enumeration);
 }
@@ -3646,6 +3656,7 @@ void bt_ctf_field_type_variant_destroy(struct bt_ctf_field_type *type)
 	g_ptr_array_free(variant->fields, TRUE);
 	g_hash_table_destroy(variant->field_name_to_index);
 	g_string_free(variant->tag_name, TRUE);
+	BT_LOGD_STR("Putting tag field type.");
 	bt_put(&variant->tag->parent);
 	BT_PUT(variant->tag_field_path);
 	g_free(variant);
@@ -3662,6 +3673,7 @@ void bt_ctf_field_type_array_destroy(struct bt_ctf_field_type *type)
 	}
 
 	BT_LOGD("Destroying array field type object: addr=%p", type);
+	BT_LOGD_STR("Putting element field type.");
 	bt_put(array->element_type);
 	g_free(array);
 }
@@ -3677,8 +3689,10 @@ void bt_ctf_field_type_sequence_destroy(struct bt_ctf_field_type *type)
 	}
 
 	BT_LOGD("Destroying sequence field type object: addr=%p", type);
+	BT_LOGD_STR("Putting element field type.");
 	bt_put(sequence->element_type);
 	g_string_free(sequence->length_field_name, TRUE);
+	BT_LOGD_STR("Putting length field path.");
 	BT_PUT(sequence->length_field_path);
 	g_free(sequence);
 }
@@ -3712,6 +3726,7 @@ void bt_ctf_field_type_integer_freeze(struct bt_ctf_field_type *type)
 	BT_LOGD("Freezing integer field type object: addr=%p", type);
 
 	if (integer_type->mapped_clock) {
+		BT_LOGD_STR("Freezing integer field type's mapped clock class.");
 		bt_ctf_clock_class_freeze(integer_type->mapped_clock);
 	}
 
@@ -3827,6 +3842,7 @@ const char *get_integer_base_string(enum bt_ctf_integer_base base)
 
 	switch (base) {
 	case BT_CTF_INTEGER_BASE_DECIMAL:
+	case BT_CTF_INTEGER_BASE_UNSPECIFIED:
 		base_string = "decimal";
 		break;
 	case BT_CTF_INTEGER_BASE_HEXADECIMAL:
@@ -3894,6 +3910,7 @@ int bt_ctf_field_type_enumeration_serialize(struct bt_ctf_field_type *type,
 	container_signed = bt_ctf_field_type_integer_get_signed(container_type);
 	assert(container_signed >= 0);
 	g_string_append(context->string, "enum : ");
+	BT_LOGD_STR("Serializing enumeration field type's container field type's metadata.");
 	ret = bt_ctf_field_type_serialize(enumeration->container, context);
 	if (ret) {
 		BT_LOGW("Cannot serialize enumeration field type's container field type's metadata: "
@@ -3975,7 +3992,7 @@ int bt_ctf_field_type_structure_serialize(struct bt_ctf_field_type *type,
 {
 	size_t i;
 	unsigned int indent;
-	int64_t ret = 0;
+	int ret = 0;
 	struct bt_ctf_field_type_structure *structure = container_of(type,
 		struct bt_ctf_field_type_structure, parent);
 	GString *structure_field_name = context->field_name;
@@ -3990,8 +4007,8 @@ int bt_ctf_field_type_structure_serialize(struct bt_ctf_field_type *type,
 	for (i = 0; i < structure->fields->len; i++) {
 		struct structure_field *field = structure->fields->pdata[i];
 
-		BT_LOGV("Serializing structure field type's field metadata: "
-			"index=%" PRId64 ", "
+		BT_LOGD("Serializing structure field type's field metadata: "
+			"index=%zu, "
 			"field-ft-addr=%p, field-name=\"%s\"",
 			i, field, g_quark_to_string(field->name));
 
@@ -4005,7 +4022,7 @@ int bt_ctf_field_type_structure_serialize(struct bt_ctf_field_type *type,
 		ret = bt_ctf_field_type_serialize(field->type, context);
 		if (ret) {
 			BT_LOGW("Cannot serialize structure field type's field's metadata: "
-				"index=%" PRId64 ", "
+				"index=%zu, "
 				"field-ft-addr=%p, field-name=\"%s\"",
 				i, field->type,
 				g_quark_to_string(field->name));
@@ -4058,8 +4075,8 @@ int bt_ctf_field_type_variant_serialize(struct bt_ctf_field_type *type,
 	for (i = 0; i < variant->fields->len; i++) {
 		struct structure_field *field = variant->fields->pdata[i];
 
-		BT_LOGV("Serializing variant field type's field metadata: "
-			"index=%" PRId64 ", "
+		BT_LOGD("Serializing variant field type's field metadata: "
+			"index=%zu, "
 			"field-ft-addr=%p, field-name=\"%s\"",
 			i, field, g_quark_to_string(field->name));
 
@@ -4075,7 +4092,7 @@ int bt_ctf_field_type_variant_serialize(struct bt_ctf_field_type *type,
 		ret = bt_ctf_field_type_serialize(field->type, context);
 		if (ret) {
 			BT_LOGW("Cannot serialize variant field type's field's metadata: "
-				"index=%" PRId64 ", "
+				"index=%zu, "
 				"field-ft-addr=%p, field-name=\"%s\"",
 				i, field->type,
 				g_quark_to_string(field->name));
@@ -4113,6 +4130,7 @@ int bt_ctf_field_type_array_serialize(struct bt_ctf_field_type *type,
 
 	BT_LOGD("Serializing array field type's metadata: "
 		"ft-addr=%p, metadata-context-addr=%p", type, context);
+	BT_LOGD_STR("Serializing array field type's element field type's metadata.");
 	ret = bt_ctf_field_type_serialize(array->element_type, context);
 	if (ret) {
 		BT_LOGW("Cannot serialize array field type's element field type's metadata: "
@@ -4141,6 +4159,7 @@ int bt_ctf_field_type_sequence_serialize(struct bt_ctf_field_type *type,
 
 	BT_LOGD("Serializing sequence field type's metadata: "
 		"ft-addr=%p, metadata-context-addr=%p", type, context);
+	BT_LOGD_STR("Serializing sequence field type's element field type's metadata.");
 	ret = bt_ctf_field_type_serialize(sequence->element_type, context);
 	if (ret) {
 		BT_LOGW("Cannot serialize sequence field type's element field type's metadata: "
@@ -4324,6 +4343,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_copy(
 		parent);
 
 	/* Copy the source enumeration's container */
+	BT_LOGD_STR("Copying enumeration field type's container field type.");
 	copy_container = bt_ctf_field_type_copy(enumeration->container);
 	if (!copy_container) {
 		BT_LOGE_STR("Cannot copy enumeration field type's container field type.");
@@ -4427,7 +4447,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_structure_copy(
 		struct bt_ctf_field_type *copy_field;
 
 		entry = g_ptr_array_index(structure->fields, i);
-		BT_LOGV("Copying structure field type's field: "
+		BT_LOGD("Copying structure field type's field: "
 			"index=%" PRId64 ", "
 			"field-ft-addr=%p, field-name=\"%s\"",
 			i, entry, g_quark_to_string(entry->name));
@@ -4476,6 +4496,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_copy(
 	variant = container_of(type, struct bt_ctf_field_type_variant,
 		parent);
 	if (variant->tag) {
+		BT_LOGD_STR("Copying variant field type's tag field type.");
 		copy_tag = bt_ctf_field_type_copy(&variant->tag->parent);
 		if (!copy_tag) {
 			BT_LOGE_STR("Cannot copy variant field type's tag field type.");
@@ -4505,7 +4526,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_copy(
 		struct bt_ctf_field_type *copy_field;
 
 		entry = g_ptr_array_index(variant->fields, i);
-		BT_LOGV("Copying variant field type's field: "
+		BT_LOGD("Copying variant field type's field: "
 			"index=%" PRId64 ", "
 			"field-ft-addr=%p, field-name=\"%s\"",
 			i, entry, g_quark_to_string(entry->name));
@@ -4531,7 +4552,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_copy(
 	}
 
 	if (variant->tag_field_path) {
-		BT_LOGV_STR("Copying variant field type's tag field path.");
+		BT_LOGD_STR("Copying variant field type's tag field path.");
 		copy_variant->tag_field_path = bt_ctf_field_path_copy(
 			variant->tag_field_path);
 		if (!copy_variant->tag_field_path) {
@@ -4562,6 +4583,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_copy(
 	BT_LOGD("Copying array field type's: addr=%p", type);
 	array = container_of(type, struct bt_ctf_field_type_array,
 		parent);
+	BT_LOGD_STR("Copying array field type's element field type.");
 	copy_element = bt_ctf_field_type_copy(array->element_type);
 	if (!copy_element) {
 		BT_LOGE_STR("Cannot copy array field type's element field type.");
@@ -4592,6 +4614,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy(
 	BT_LOGD("Copying sequence field type's: addr=%p", type);
 	sequence = container_of(type, struct bt_ctf_field_type_sequence,
 		parent);
+	BT_LOGD_STR("Copying sequence field type's element field type.");
 	copy_element = bt_ctf_field_type_copy(sequence->element_type);
 	if (!copy_element) {
 		BT_LOGE_STR("Cannot copy sequence field type's element field type.");
@@ -4609,7 +4632,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_copy(
 	copy_sequence = container_of(copy, struct bt_ctf_field_type_sequence,
 		parent);
 	if (sequence->length_field_path) {
-		BT_LOGV_STR("Copying sequence field type's length field path.");
+		BT_LOGD_STR("Copying sequence field type's length field path.");
 		copy_sequence->length_field_path = bt_ctf_field_path_copy(
 			sequence->length_field_path);
 		if (!copy_sequence->length_field_path) {
@@ -4634,7 +4657,6 @@ 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;
 
 	BT_LOGD("Copying string field type's: addr=%p", type);
 	copy = bt_ctf_field_type_string_create();
@@ -4643,8 +4665,6 @@ struct bt_ctf_field_type *bt_ctf_field_type_string_copy(
 		goto end;
 	}
 
-	string = container_of(type, struct bt_ctf_field_type_string,
-		parent);
 	BT_LOGD("Copied string field type: original-ft-addr=%p, copy-ft-addr=%p",
 		type, copy);
 end:
@@ -4712,8 +4732,8 @@ int bt_ctf_field_type_integer_compare(struct bt_ctf_field_type *type_a,
 	if (int_type_a->mapped_clock != int_type_b->mapped_clock) {
 		BT_LOGV("Integer field types differ: different mapped clock classes: "
 			"ft-a-mapped-clock-class-addr=%p, "
-			"ft-b-mapped-clock-class-addr=%p, ",
-			"ft-a-mapped-clock-class-name=\"%s\", ",
+			"ft-b-mapped-clock-class-addr=%p, "
+			"ft-a-mapped-clock-class-name=\"%s\", "
 			"ft-b-mapped-clock-class-name=\"%s\"",
 			int_type_a->mapped_clock, int_type_b->mapped_clock,
 			int_type_a->mapped_clock ? bt_ctf_clock_class_get_name(int_type_a->mapped_clock) : "",
@@ -4753,7 +4773,7 @@ int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *type_a,
 	/* Exponent length */
 	if (float_a->exp_dig != float_b->exp_dig) {
 		BT_LOGV("Floating point number field types differ: different exponent sizes: "
-			"ft-a-exp-size=%s, ft-b-exp-size=%s",
+			"ft-a-exp-size=%u, ft-b-exp-size=%u",
 			float_a->exp_dig, float_b->exp_dig);
 		goto end;
 	}
@@ -4761,7 +4781,7 @@ int bt_ctf_field_type_floating_point_compare(struct bt_ctf_field_type *type_a,
 	/* Mantissa length */
 	if (float_a->mant_dig != float_b->mant_dig) {
 		BT_LOGV("Floating point number field types differ: different mantissa sizes: "
-			"ft-a-mant-size=%s, ft-b-mant-size=%s",
+			"ft-a-mant-size=%u, ft-b-mant-size=%u",
 			float_a->mant_dig, float_b->mant_dig);
 		goto end;
 	}
@@ -4919,7 +4939,7 @@ int compare_structure_fields(struct structure_field *field_a,
 	ret = bt_ctf_field_type_compare(field_a->type, field_b->type);
 	if (ret == 1) {
 		BT_LOGV("Structure/variant field type fields differ: different field types: "
-			"field-name=\"%s\", field-a-ft-addr=%s, field-b-ft-addr=%s",
+			"field-name=\"%s\", field-a-ft-addr=%p, field-b-ft-addr=%p",
 			g_quark_to_string(field_a->name),
 			field_a->type, field_b->type);
 	}
@@ -4998,7 +5018,7 @@ int bt_ctf_field_type_variant_compare(struct bt_ctf_field_type *type_a,
 	/* Tag name */
 	if (strcmp(variant_a->tag_name->str, variant_b->tag_name->str)) {
 		BT_LOGV("Variant field types differ: different tag field names: "
-			"ft-a-tag-field-name=%u, ft-b-tag-field-name=%u",
+			"ft-a-tag-field-name=\"%s\", ft-b-tag-field-name=\"%s\"",
 			variant_a->tag_name->str, variant_b->tag_name->str);
 		goto end;
 	}
@@ -5096,7 +5116,8 @@ int bt_ctf_field_type_sequence_compare(struct bt_ctf_field_type *type_a,
 	if (strcmp(sequence_a->length_field_name->str,
 			sequence_b->length_field_name->str)) {
 		BT_LOGV("Sequence field types differ: different length field names: "
-			"ft-a-length-field-name=%u, ft-b-length-field-name=%u",
+			"ft-a-length-field-name=\"%s\", "
+			"ft-b-length-field-name=\"%s\"",
 			sequence_a->length_field_name->str,
 			sequence_b->length_field_name->str);
 		goto end;
@@ -5204,9 +5225,15 @@ struct bt_ctf_field_type *bt_ctf_field_type_get_field_at_index(
 
 	switch (type_id) {
 	case CTF_TYPE_STRUCT:
-		bt_ctf_field_type_structure_get_field_by_index(field_type,
-			NULL, &field, index);
+	{
+		int ret = bt_ctf_field_type_structure_get_field_by_index(
+			field_type, NULL, &field, index);
+		if (ret) {
+			field = NULL;
+			goto end;
+		}
 		break;
+	}
 	case CTF_TYPE_VARIANT:
 	{
 		int ret = bt_ctf_field_type_variant_get_field_by_index(