X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent-fields.c;h=a3de98f617063a121e9f9b75da79ed3ad1bc6395;hb=83509119a945fc77faff869daaf48627e1c4b3fa;hp=aefb3af2626bf391449dfb4a0b1f5c50c70edde7;hpb=ce6da4fd76d8f00d4b1cd60bbd40db64816db997;p=babeltrace.git

diff --git a/formats/ctf/ir/event-fields.c b/formats/ctf/ir/event-fields.c
index aefb3af2..a3de98f6 100644
--- a/formats/ctf/ir/event-fields.c
+++ b/formats/ctf/ir/event-fields.c
@@ -29,6 +29,8 @@
 #include <babeltrace/ctf-writer/event-fields.h>
 #include <babeltrace/ctf-ir/event-fields-internal.h>
 #include <babeltrace/ctf-ir/event-types-internal.h>
+#include <babeltrace/object-internal.h>
+#include <babeltrace/ref.h>
 #include <babeltrace/compiler.h>
 
 #define PACKET_LEN_INCREMENT	(getpagesize() * 8 * CHAR_BIT)
@@ -57,7 +59,7 @@ static
 struct bt_ctf_field *bt_ctf_field_string_create(struct bt_ctf_field_type *);
 
 static
-void bt_ctf_field_destroy(struct bt_ctf_ref *);
+void bt_ctf_field_destroy(struct bt_object *);
 static
 void bt_ctf_field_integer_destroy(struct bt_ctf_field *);
 static
@@ -249,8 +251,8 @@ struct bt_ctf_field *bt_ctf_field_create(struct bt_ctf_field_type *type)
 
 	/* The type's declaration can't change after this point */
 	bt_ctf_field_type_freeze(type);
-	bt_ctf_field_type_get(type);
-	bt_ctf_ref_init(&field->ref_count);
+	bt_get(type);
+	bt_object_init(field, bt_ctf_field_destroy);
 	field->type = type;
 error:
 	return field;
@@ -258,16 +260,12 @@ error:
 
 void bt_ctf_field_get(struct bt_ctf_field *field)
 {
-	if (field) {
-		bt_ctf_ref_get(&field->ref_count);
-	}
+	bt_get(field);
 }
 
 void bt_ctf_field_put(struct bt_ctf_field *field)
 {
-	if (field) {
-		bt_ctf_ref_put(&field->ref_count, bt_ctf_field_destroy);
-	}
+	bt_put(field);
 }
 
 struct bt_ctf_field_type *bt_ctf_field_get_type(struct bt_ctf_field *field)
@@ -279,7 +277,7 @@ struct bt_ctf_field_type *bt_ctf_field_get_type(struct bt_ctf_field *field)
 	}
 
 	ret = field->type;
-	bt_ctf_field_type_get(ret);
+	bt_get(ret);
 end:
 	return ret;
 }
@@ -301,7 +299,7 @@ struct bt_ctf_field *bt_ctf_field_sequence_get_length(
 
 	sequence = container_of(field, struct bt_ctf_field_sequence, parent);
 	ret = sequence->length;
-	bt_ctf_field_get(ret);
+	bt_get(ret);
 end:
 	return ret;
 }
@@ -339,7 +337,7 @@ int bt_ctf_field_sequence_set_length(struct bt_ctf_field *field,
 	sequence = container_of(field, struct bt_ctf_field_sequence, parent);
 	if (sequence->elements) {
 		g_ptr_array_free(sequence->elements, TRUE);
-		bt_ctf_field_put(sequence->length);
+		bt_put(sequence->length);
 	}
 
 	sequence->elements = g_ptr_array_sized_new((size_t)sequence_length);
@@ -349,9 +347,9 @@ int bt_ctf_field_sequence_set_length(struct bt_ctf_field *field,
 	}
 
 	g_ptr_array_set_free_func(sequence->elements,
-		(GDestroyNotify)bt_ctf_field_put);
-	g_ptr_array_set_size(sequence->elements, (size_t)sequence_length);
-	bt_ctf_field_get(length_field);
+		(GDestroyNotify) bt_put);
+	g_ptr_array_set_size(sequence->elements, (size_t) sequence_length);
+	bt_get(length_field);
 	sequence->length = length_field;
 end:
 	return ret;
@@ -394,10 +392,10 @@ struct bt_ctf_field *bt_ctf_field_structure_get_field(
 
 	structure->fields->pdata[index] = new_field;
 end:
-	bt_ctf_field_get(new_field);
+	bt_get(new_field);
 error:
 	if (field_type) {
-		bt_ctf_field_type_put(field_type);
+		bt_put(field_type);
 	}
 	return new_field;
 }
@@ -435,7 +433,7 @@ struct bt_ctf_field *bt_ctf_field_structure_get_field_by_index(
 
 	ret = bt_ctf_field_type_structure_get_field(structure_type,
 		&field_name, &field_type, index);
-	bt_ctf_field_type_put(structure_type);
+	bt_put(structure_type);
 	if (ret) {
 		goto error;
 	}
@@ -447,11 +445,9 @@ struct bt_ctf_field *bt_ctf_field_structure_get_field_by_index(
 
 	structure->fields->pdata[index] = ret_field;
 end:
-	bt_ctf_field_get(ret_field);
+	bt_get(ret_field);
 error:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(field_type);
 	return ret_field;
 }
 
@@ -488,14 +484,14 @@ int bt_ctf_field_structure_set_field(struct bt_ctf_field *field,
 	}
 
 	if (structure->fields->pdata[index]) {
-		bt_ctf_field_put(structure->fields->pdata[index]);
+		bt_put(structure->fields->pdata[index]);
 	}
 
 	structure->fields->pdata[index] = value;
-	bt_ctf_field_get(value);
+	bt_get(value);
 end:
 	if (expected_field_type) {
-		bt_ctf_field_type_put(expected_field_type);
+		bt_put(expected_field_type);
 	}
 	return ret;
 }
@@ -524,11 +520,13 @@ struct bt_ctf_field *bt_ctf_field_array_get_field(struct bt_ctf_field *field,
 	}
 
 	new_field = bt_ctf_field_create(field_type);
-	bt_ctf_field_get(new_field);
 	array->elements->pdata[(size_t)index] = new_field;
 end:
 	if (field_type) {
-		bt_ctf_field_type_put(field_type);
+		bt_put(field_type);
+	}
+	if (new_field) {
+		bt_get(new_field);
 	}
 	return new_field;
 }
@@ -551,17 +549,19 @@ struct bt_ctf_field *bt_ctf_field_sequence_get_field(struct bt_ctf_field *field,
 	}
 
 	field_type = bt_ctf_field_type_sequence_get_element_type(field->type);
-	if (sequence->elements->pdata[(size_t)index]) {
-		new_field = sequence->elements->pdata[(size_t)index];
+	if (sequence->elements->pdata[(size_t) index]) {
+		new_field = sequence->elements->pdata[(size_t) index];
 		goto end;
 	}
 
 	new_field = bt_ctf_field_create(field_type);
-	bt_ctf_field_get(new_field);
-	sequence->elements->pdata[(size_t)index] = new_field;
+	sequence->elements->pdata[(size_t) index] = new_field;
 end:
 	if (field_type) {
-		bt_ctf_field_type_put(field_type);
+		bt_put(field_type);
+	}
+	if (new_field) {
+		bt_get(new_field);
 	}
 	return new_field;
 }
@@ -601,6 +601,31 @@ struct bt_ctf_field *bt_ctf_field_variant_get_field(struct bt_ctf_field *field,
 	}
 
 	tag_enum_value = tag_enum_integer->definition.value._signed;
+
+	/*
+	 * If the variant currently has a tag and a payload, and if the
+	 * requested tag value is the same as the current one, return
+	 * the current payload instead of creating a fresh one.
+	 */
+	if (variant->tag && variant->payload) {
+		struct bt_ctf_field *cur_tag_container = NULL;
+		struct bt_ctf_field_integer *cur_tag_enum_integer;
+		int64_t cur_tag_value;
+
+		cur_tag_container =
+			bt_ctf_field_enumeration_get_container(variant->tag);
+		cur_tag_enum_integer = container_of(cur_tag_container,
+			struct bt_ctf_field_integer, parent);
+		bt_put(cur_tag_container);
+		cur_tag_value = cur_tag_enum_integer->definition.value._signed;
+
+		if (cur_tag_value == tag_enum_value) {
+			new_field = variant->payload;
+			bt_get(new_field);
+			goto end;
+		}
+	}
+
 	field_type = bt_ctf_field_type_variant_get_field_type_signed(
 		variant_type, tag_enum_value);
 	if (!field_type) {
@@ -612,17 +637,42 @@ struct bt_ctf_field *bt_ctf_field_variant_get_field(struct bt_ctf_field *field,
 		goto end;
 	}
 
-	bt_ctf_field_put(variant->tag);
-	bt_ctf_field_put(variant->payload);
-	bt_ctf_field_get(new_field);
-	bt_ctf_field_get(tag_field);
+	bt_put(variant->tag);
+	bt_put(variant->payload);
+	bt_get(new_field);
+	bt_get(tag_field);
 	variant->tag = tag_field;
 	variant->payload = new_field;
 end:
-	bt_ctf_field_put(tag_enum);
+	bt_put(tag_enum);
 	return new_field;
 }
 
+struct bt_ctf_field *bt_ctf_field_variant_get_current_field(
+		struct bt_ctf_field *variant_field)
+{
+	struct bt_ctf_field *current_field = NULL;
+	struct bt_ctf_field_variant *variant;
+
+	if (!variant_field ||
+		bt_ctf_field_type_get_type_id(variant_field->type) !=
+			CTF_TYPE_VARIANT) {
+		goto end;
+	}
+
+	variant = container_of(variant_field, struct bt_ctf_field_variant,
+		parent);
+
+	if (variant->payload) {
+		current_field = variant->payload;
+		bt_get(current_field);
+		goto end;
+	}
+
+end:
+	return current_field;
+}
+
 struct bt_ctf_field *bt_ctf_field_enumeration_get_container(
 	struct bt_ctf_field *field)
 {
@@ -645,7 +695,7 @@ struct bt_ctf_field *bt_ctf_field_enumeration_get_container(
 	}
 
 	container = enumeration->payload;
-	bt_ctf_field_get(container);
+	bt_get(container);
 end:
 	return container;
 }
@@ -698,9 +748,9 @@ const char *bt_ctf_field_enumeration_get_mapping_name(
 	}
 
 error_put_container_type:
-	bt_ctf_field_type_put(container_type);
+	bt_put(container_type);
 error_put_container:
-	bt_ctf_field_put(container);
+	bt_put(container);
 end:
 	return name;
 }
@@ -919,6 +969,72 @@ end:
 	return ret;
 }
 
+int bt_ctf_field_string_append(struct bt_ctf_field *field,
+		const char *value)
+{
+	int ret = 0;
+	struct bt_ctf_field_string *string_field;
+
+	if (!field || !value ||
+		bt_ctf_field_type_get_type_id(field->type) !=
+			CTF_TYPE_STRING) {
+		ret = -1;
+		goto end;
+	}
+
+	string_field = container_of(field, struct bt_ctf_field_string, parent);
+
+	if (string_field->payload) {
+		g_string_append(string_field->payload, value);
+	} else {
+		string_field->payload = g_string_new(value);
+	}
+
+	string_field->parent.payload_set = 1;
+
+end:
+	return ret;
+}
+
+int bt_ctf_field_string_append_len(struct bt_ctf_field *field,
+		const char *value, unsigned int length)
+{
+	int i;
+	int ret = 0;
+	unsigned int effective_length = length;
+	struct bt_ctf_field_string *string_field;
+
+	if (!field || !value ||
+		bt_ctf_field_type_get_type_id(field->type) !=
+			CTF_TYPE_STRING) {
+		ret = -1;
+		goto end;
+	}
+
+	string_field = container_of(field, struct bt_ctf_field_string, parent);
+
+	/* make sure no null bytes are appended */
+	for (i = 0; i < length; ++i) {
+		if (value[i] == '\0') {
+			effective_length = i;
+			break;
+		}
+	}
+
+	if (string_field->payload) {
+		g_string_append_len(string_field->payload, value,
+			effective_length);
+	} else {
+		string_field->payload = g_string_new_len(value,
+			effective_length);
+	}
+
+	string_field->parent.payload_set = 1;
+
+end:
+	return ret;
+}
+
 BT_HIDDEN
 int bt_ctf_field_validate(struct bt_ctf_field *field)
 {
@@ -986,7 +1102,6 @@ end:
 	return ret;
 }
 
-BT_HIDDEN
 struct bt_ctf_field *bt_ctf_field_copy(struct bt_ctf_field *field)
 {
 	int ret;
@@ -1007,9 +1122,10 @@ struct bt_ctf_field *bt_ctf_field_copy(struct bt_ctf_field *field)
 		goto end;
 	}
 
+	copy->payload_set = field->payload_set;
 	ret = field_copy_funcs[type_id](field, copy);
 	if (ret) {
-		bt_ctf_field_put(copy);
+		bt_put(copy);
 		copy = NULL;
 	}
 end:
@@ -1155,17 +1271,13 @@ struct bt_ctf_field *bt_ctf_field_string_create(struct bt_ctf_field_type *type)
 }
 
 static
-void bt_ctf_field_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_field_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_field *field;
 	struct bt_ctf_field_type *type;
 	enum ctf_type_id type_id;
 
-	if (!ref) {
-		return;
-	}
-
-	field = container_of(ref, struct bt_ctf_field, ref_count);
+	field = container_of(obj, struct bt_ctf_field, base);
 	type = field->type;
 	type_id = bt_ctf_field_type_get_type_id(type);
 	if (type_id <= CTF_TYPE_UNKNOWN ||
@@ -1174,9 +1286,7 @@ void bt_ctf_field_destroy(struct bt_ctf_ref *ref)
 	}
 
 	field_destroy_funcs[type_id](field);
-	if (type) {
-		bt_ctf_field_type_put(type);
-	}
+	bt_put(type);
 }
 
 static
@@ -1203,7 +1313,7 @@ void bt_ctf_field_enumeration_destroy(struct bt_ctf_field *field)
 
 	enumeration = container_of(field, struct bt_ctf_field_enumeration,
 		parent);
-	bt_ctf_field_put(enumeration->payload);
+	bt_put(enumeration->payload);
 	g_free(enumeration);
 }
 
@@ -1245,8 +1355,8 @@ void bt_ctf_field_variant_destroy(struct bt_ctf_field *field)
 	}
 
 	variant = container_of(field, struct bt_ctf_field_variant, parent);
-	bt_ctf_field_put(variant->tag);
-	bt_ctf_field_put(variant->payload);
+	bt_put(variant->tag);
+	bt_put(variant->payload);
 	g_free(variant);
 }
 
@@ -1274,8 +1384,10 @@ void bt_ctf_field_sequence_destroy(struct bt_ctf_field *field)
 	}
 
 	sequence = container_of(field, struct bt_ctf_field_sequence, parent);
-	g_ptr_array_free(sequence->elements, TRUE);
-	bt_ctf_field_put(sequence->length);
+	if (sequence->elements) {
+		g_ptr_array_free(sequence->elements, TRUE);
+	}
+	bt_put(sequence->length);
 	g_free(sequence);
 }
 
@@ -1288,7 +1400,9 @@ void bt_ctf_field_string_destroy(struct bt_ctf_field *field)
 	}
 
 	string = container_of(field, struct bt_ctf_field_string, parent);
-	g_string_free(string->payload, TRUE);
+	if (string->payload) {
+		g_string_free(string->payload, TRUE);
+	}
 	g_free(string);
 }
 
@@ -1757,8 +1871,8 @@ int bt_ctf_field_string_serialize(struct bt_ctf_field *field,
 		}
 	}
 end:
-	bt_ctf_field_put(character);
-	bt_ctf_field_type_put(character_type);
+	bt_put(character);
+	bt_put(character_type);
 	return ret;
 }
 
@@ -1834,13 +1948,19 @@ int bt_ctf_field_structure_copy(struct bt_ctf_field *src,
 	g_ptr_array_set_size(struct_dst->fields, struct_src->fields->len);
 
 	for (i = 0; i < struct_src->fields->len; i++) {
-		struct bt_ctf_field *field_copy = bt_ctf_field_copy(
-			g_ptr_array_index(struct_src->fields, i));
+		struct bt_ctf_field *field =
+			g_ptr_array_index(struct_src->fields, i);
+		struct bt_ctf_field *field_copy = NULL;
 
-		if (!field_copy) {
-			ret = -1;
-			goto end;
+		if (field) {
+			field_copy = bt_ctf_field_copy(field);
+
+			if (!field_copy) {
+				ret = -1;
+				goto end;
+			}
 		}
+
 		g_ptr_array_index(struct_dst->fields, i) = field_copy;
 	}
 end:
@@ -1887,13 +2007,19 @@ int bt_ctf_field_array_copy(struct bt_ctf_field *src,
 
 	g_ptr_array_set_size(array_dst->elements, array_src->elements->len);
 	for (i = 0; i < array_src->elements->len; i++) {
-		struct bt_ctf_field *field_copy = bt_ctf_field_copy(
-			g_ptr_array_index(array_src->elements, i));
+		struct bt_ctf_field *field =
+			g_ptr_array_index(array_src->elements, i);
+		struct bt_ctf_field *field_copy = NULL;
 
-		if (!field_copy) {
-			ret = -1;
-			goto end;
+		if (field) {
+			field_copy = bt_ctf_field_copy(field);
+
+			if (!field_copy) {
+				ret = -1;
+				goto end;
+			}
 		}
+
 		g_ptr_array_index(array_dst->elements, i) = field_copy;
 	}
 end:
@@ -1906,20 +2032,52 @@ int bt_ctf_field_sequence_copy(struct bt_ctf_field *src,
 {
 	int ret = 0, i;
 	struct bt_ctf_field_sequence *sequence_src, *sequence_dst;
+	struct bt_ctf_field *src_length;
+	struct bt_ctf_field *dst_length;
 
 	sequence_src = container_of(src, struct bt_ctf_field_sequence, parent);
 	sequence_dst = container_of(dst, struct bt_ctf_field_sequence, parent);
 
-	g_ptr_array_set_size(sequence_dst->elements,
-		sequence_src->elements->len);
+	src_length = bt_ctf_field_sequence_get_length(src);
+
+	if (!src_length) {
+		/* no length set yet: keep destination sequence empty */
+		goto end;
+	}
+
+	/* copy source length */
+	dst_length = bt_ctf_field_copy(src_length);
+	bt_put(src_length);
+
+	if (!dst_length) {
+		ret = -1;
+		goto end;
+	}
+
+	/* this will initialize the destination sequence's internal array */
+	ret = bt_ctf_field_sequence_set_length(dst, dst_length);
+	bt_put(dst_length);
+
+	if (ret) {
+		goto end;
+	}
+
+	assert(sequence_dst->elements->len == sequence_src->elements->len);
+
 	for (i = 0; i < sequence_src->elements->len; i++) {
-		struct bt_ctf_field *field_copy = bt_ctf_field_copy(
-			g_ptr_array_index(sequence_src->elements, i));
+		struct bt_ctf_field *field =
+			g_ptr_array_index(sequence_src->elements, i);
+		struct bt_ctf_field *field_copy = NULL;
 
-		if (!field_copy) {
-			ret = -1;
-			goto end;
+		if (field) {
+			field_copy = bt_ctf_field_copy(field);
+
+			if (!field_copy) {
+				ret = -1;
+				goto end;
+			}
 		}
+
 		g_ptr_array_index(sequence_dst->elements, i) = field_copy;
 	}
 end: