X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-types.c;h=11ca0e9e0b44bf57e359c92d034a8a73aa66112a;hb=d9b1ab6dad281d8ba70f6c8dd372ab489ea465c0;hp=ee81257149673373ed00c7d94af1a637a47ec4d4;hpb=4ebdec03ec8a1da1d672229533d1c699ed875555;p=babeltrace.git

diff --git a/formats/ctf/ir/event-types.c b/formats/ctf/ir/event-types.c
index ee812571..11ca0e9e 100644
--- a/formats/ctf/ir/event-types.c
+++ b/formats/ctf/ir/event-types.c
@@ -188,6 +188,44 @@ 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
 void destroy_enumeration_mapping(struct enumeration_mapping *mapping)
 {
@@ -320,9 +358,6 @@ void bt_ctf_field_type_destroy(struct bt_ctf_ref *ref)
 		return;
 	}
 
-	if (type->alias_name) {
-		g_string_free(type->alias_name, TRUE);
-	}
 	type_destroy_funcs[type_id](ref);
 }
 
@@ -347,6 +382,27 @@ int bt_ctf_field_type_validate(struct bt_ctf_field_type *type)
 		ret = enumeration->entries->len ? 0 : -1;
 		break;
 	}
+	case CTF_TYPE_SEQUENCE:
+	{
+		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 */
+		ret = sequence->length_field_name->len ? 0 : -1;
+		break;
+	}
+	case CTF_TYPE_VARIANT:
+	{
+		struct bt_ctf_field_type_variant *variant =
+			container_of(type, struct bt_ctf_field_type_variant,
+				parent);
+
+		if (variant->tag_name->len == 0 || !variant->tag) {
+			ret = -1;
+		}
+		break;
+	}
 	default:
 		break;
 	}
@@ -1210,8 +1266,7 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
 {
 	struct bt_ctf_field_type_variant *variant = NULL;
 
-	if (!enum_tag || bt_ctf_validate_identifier(tag_name) ||
-		(enum_tag->declaration->id != CTF_TYPE_ENUM)) {
+	if (tag_name && bt_ctf_validate_identifier(tag_name)) {
 		goto error;
 	}
 
@@ -1226,9 +1281,12 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_create(
 	variant->field_name_to_index = g_hash_table_new(NULL, NULL);
 	variant->fields = g_ptr_array_new_with_free_func(
 		(GDestroyNotify)destroy_structure_field);
-	bt_ctf_field_type_get(enum_tag);
-	variant->tag = container_of(enum_tag,
-		struct bt_ctf_field_type_enumeration, parent);
+	if (enum_tag) {
+		bt_ctf_field_type_get(enum_tag);
+		variant->tag = container_of(enum_tag,
+			struct bt_ctf_field_type_enumeration, parent);
+	}
+
 	bt_ctf_field_type_init(&variant->parent);
 	return &variant->parent;
 error:
@@ -1246,6 +1304,10 @@ struct bt_ctf_field_type *bt_ctf_field_type_variant_get_tag_type(
 	}
 
 	variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+	if (!variant->tag) {
+		goto end;
+	}
+
 	tag_type = &variant->tag->parent;
 	bt_ctf_field_type_get(tag_type);
 end:
@@ -1263,18 +1325,40 @@ const char *bt_ctf_field_type_variant_get_tag_name(
 	}
 
 	variant = container_of(type, struct bt_ctf_field_type_variant, parent);
+	if (variant->tag_name->len == 0) {
+		goto end;
+	}
+
 	tag_name = variant->tag_name->str;
 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)
 {
 	size_t i;
 	int ret = 0;
-	int name_found = 0;
 	struct bt_ctf_field_type_variant *variant;
 	GQuark field_name_quark = g_quark_from_string(field_name);
 
@@ -1287,19 +1371,31 @@ int bt_ctf_field_type_variant_add_field(struct bt_ctf_field_type *type,
 	}
 
 	variant = container_of(type, struct bt_ctf_field_type_variant, parent);
-	/* Make sure this name is present in the enum tag */
-	for (i = 0; i < variant->tag->entries->len; i++) {
-		struct enumeration_mapping *mapping =
-			g_ptr_array_index(variant->tag->entries, i);
 
-		if (mapping->string == field_name_quark) {
-			name_found = 1;
-			break;
+	/* The user has explicitly provided a tag; validate against it. */
+	if (variant->tag) {
+		int name_found = 0;
+
+		/* Make sure this name is present in the enum tag */
+		for (i = 0; i < variant->tag->entries->len; i++) {
+			struct enumeration_mapping *mapping =
+				g_ptr_array_index(variant->tag->entries, i);
+
+			if (mapping->string == field_name_quark) {
+				name_found = 1;
+				break;
+			}
+		}
+
+		if (!name_found) {
+			/* Validation failed */
+			ret = -1;
+			goto end;
 		}
 	}
 
-	if (!name_found || add_structure_field(variant->fields,
-		variant->field_name_to_index, field_type, field_name)) {
+	if (add_structure_field(variant->fields, variant->field_name_to_index,
+		field_type, field_name)) {
 		ret = -1;
 		goto end;
 	}
@@ -1686,7 +1782,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. */
@@ -1704,6 +1799,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);
 	}
@@ -1721,20 +1817,6 @@ enum ctf_type_id bt_ctf_field_type_get_type_id(
 	return type->declaration->id;
 }
 
-const char *bt_ctf_field_type_get_alias_name(
-		struct bt_ctf_field_type *type)
-{
-	const char *name = NULL;
-
-	if (!type || !type->alias_name) {
-		goto end;
-	}
-
-	name = type->alias_name->str;
-end:
-	return name;
-}
-
 void bt_ctf_field_type_get(struct bt_ctf_field_type *type)
 {
 	if (!type) {
@@ -1859,6 +1941,20 @@ void bt_ctf_field_type_set_native_byte_order(struct bt_ctf_field_type *type,
 	}
 }
 
+BT_HIDDEN
+struct bt_ctf_field_type *bt_ctf_field_type_copy(struct bt_ctf_field_type *type)
+{
+	struct bt_ctf_field_type *copy = NULL;
+
+	if (!type) {
+		goto end;
+	}
+
+	copy = type_copy_funcs[type->declaration->id](type);
+end:
+	return copy;
+}
+
 static
 void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
 {
@@ -1871,7 +1967,9 @@ void bt_ctf_field_type_integer_destroy(struct bt_ctf_ref *ref)
 	integer = container_of(
 		container_of(ref, struct bt_ctf_field_type, ref_count),
 		struct bt_ctf_field_type_integer, parent);
-	bt_ctf_clock_put(integer->mapped_clock);
+	if (integer->mapped_clock) {
+		bt_ctf_clock_put(integer->mapped_clock);
+	}
 	g_free(integer);
 }
 
@@ -2303,8 +2401,13 @@ int bt_ctf_field_type_variant_serialize(struct bt_ctf_field_type *type,
 	GString *variant_field_name = context->field_name;
 
 	context->field_name = g_string_new("");
-	g_string_append_printf(context->string,
-		"variant <%s> {\n", variant->tag_name->str);
+	if (variant->tag_name->len > 0) {
+		g_string_append_printf(context->string,
+			"variant <%s> {\n", variant->tag_name->str);
+	} else {
+		g_string_append(context->string, "variant {\n");
+	}
+
 	context->current_indentation_level++;
 	for (i = 0; i < variant->fields->len; i++) {
 		struct structure_field *field = variant->fields->pdata[i];
@@ -2536,3 +2639,315 @@ 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_ctf_clock_get(integer->mapped_clock);
+		copy_integer->mapped_clock = integer->mapped_clock;
+	}
+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:
+	if (copy_container) {
+		bt_ctf_field_type_put(copy_container);
+	}
+	return copy;
+error:
+	if (copy_container) {
+		bt_ctf_field_type_put(copy_container);
+	}
+	bt_ctf_field_type_put(copy);
+	return NULL;
+}
+
+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;
+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_ctf_field_type_put(copy);
+	return NULL;
+}
+
+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;
+end:
+	if (copy_tag) {
+		bt_ctf_field_type_put(copy_tag);
+	}
+
+	return copy;
+error:
+	if (copy_tag) {
+		bt_ctf_field_type_put(copy_tag);
+	}
+
+	bt_ctf_field_type_put(copy);
+	return NULL;
+}
+
+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:
+	if (copy_element) {
+		bt_ctf_field_type_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;
+end:
+	if (copy_element) {
+		bt_ctf_field_type_put(copy_element);
+	}
+
+	return copy;
+}
+
+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;
+}