X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=5079d6982d97dc72e476853fad18f8716e0576e2;hb=40e99cb3fc31b1aa956fcade62a411f3c4e96cd9;hp=703e708e228cde046aa7c74c6982b37cb92295b3;hpb=6c827042b878570fc8418a7d3c99b2657c2541da;p=babeltrace.git

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index 703e708e..5079d698 100644
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -291,10 +291,9 @@ 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));
@@ -302,8 +301,13 @@ void bt_ctf_field_type_init(struct bt_ctf_field_type *type)
 	bt_ctf_ref_init(&type->ref_count);
 	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;
 }
 
@@ -424,7 +428,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;
 }
 
@@ -628,7 +632,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_enumeration_create(
 	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);
@@ -1033,7 +1037,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;
 }
@@ -1144,7 +1148,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;
@@ -1285,7 +1289,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
 			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;
@@ -1530,7 +1534,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_array_create(
 	bt_ctf_field_type_get(element_type);
 	array->element_type = element_type;
 	array->length = length;
-	bt_ctf_field_type_init(&array->parent);
+	bt_ctf_field_type_init(&array->parent, FALSE);
 	return &array->parent;
 error:
 	return NULL;
@@ -1590,7 +1594,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_sequence_create(
 	bt_ctf_field_type_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);
+	bt_ctf_field_type_init(&sequence->parent, FALSE);
 	return &sequence->parent;
 error:
 	return NULL;
@@ -1642,7 +1646,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;
@@ -1776,14 +1780,20 @@ 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 bit-aligned (1) or byte aligned */
-	if (!type || type->frozen || (alignment != 1 && (alignment & 0x7))) {
+	/* Alignment must be a power of two */
+	if (!type || type->frozen || !is_power_of_two(alignment)) {
 		ret = -1;
 		goto end;
 	}
@@ -1800,8 +1810,8 @@ int bt_ctf_field_type_set_alignment(struct bt_ctf_field_type *type,
 		goto end;
 	}
 
-	if (type_id == CTF_TYPE_STRUCT || type_id == CTF_TYPE_VARIANT ||
-		type_id == CTF_TYPE_SEQUENCE || type_id == CTF_TYPE_ARRAY) {
+	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;