X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Fir%2Ffields.c;h=1a2a2c7f5d95b8a8cae94b9d7dc312bf205abc74;hb=24626e8bc3516dd3b075489b42576c9045070b4a;hp=55af6d0a5b3c0506e6a7c1be74febd49c48f334a;hpb=e5ed1ccf57fb9a0693f3e3ec56204f88856b5b34;p=babeltrace.git

diff --git a/formats/ctf/ir/fields.c b/formats/ctf/ir/fields.c
index 55af6d0a..1a2a2c7f 100644
--- a/formats/ctf/ir/fields.c
+++ b/formats/ctf/ir/fields.c
@@ -161,6 +161,19 @@ void bt_ctf_field_array_freeze(struct bt_ctf_field *);
 static
 void bt_ctf_field_sequence_freeze(struct bt_ctf_field *);
 
+static
+bool bt_ctf_field_generic_is_set(struct bt_ctf_field *);
+static
+bool bt_ctf_field_structure_is_set(struct bt_ctf_field *);
+static
+bool bt_ctf_field_variant_is_set(struct bt_ctf_field *);
+static
+bool bt_ctf_field_enumeration_is_set(struct bt_ctf_field *);
+static
+bool bt_ctf_field_array_is_set(struct bt_ctf_field *);
+static
+bool bt_ctf_field_sequence_is_set(struct bt_ctf_field *);
+
 static
 int increase_packet_size(struct ctf_stream_pos *pos);
 
@@ -254,6 +267,18 @@ void (* const field_freeze_funcs[])(struct bt_ctf_field *) = {
 	[BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_sequence_freeze,
 };
 
+static
+bool (* const field_is_set_funcs[])(struct bt_ctf_field *) = {
+	[BT_CTF_TYPE_ID_INTEGER] = bt_ctf_field_generic_is_set,
+	[BT_CTF_TYPE_ID_ENUM] = bt_ctf_field_enumeration_is_set,
+	[BT_CTF_TYPE_ID_FLOAT] = bt_ctf_field_generic_is_set,
+	[BT_CTF_TYPE_ID_STRUCT] = bt_ctf_field_structure_is_set,
+	[BT_CTF_TYPE_ID_VARIANT] = bt_ctf_field_variant_is_set,
+	[BT_CTF_TYPE_ID_ARRAY] = bt_ctf_field_array_is_set,
+	[BT_CTF_TYPE_ID_SEQUENCE] = bt_ctf_field_sequence_is_set,
+	[BT_CTF_TYPE_ID_STRING] = bt_ctf_field_generic_is_set,
+};
+
 struct bt_ctf_field *bt_ctf_field_create(struct bt_ctf_field_type *type)
 {
 	struct bt_ctf_field *field = NULL;
@@ -1243,6 +1268,27 @@ end:
 	return ret;
 }
 
+
+BT_HIDDEN
+bool bt_ctf_field_is_set(struct bt_ctf_field *field)
+{
+	bool is_set = false;
+	enum bt_ctf_type_id type_id;
+
+	if (!field) {
+		goto end;
+	}
+
+	type_id = bt_ctf_field_type_get_type_id(field->type);
+	if (type_id <= BT_CTF_TYPE_ID_UNKNOWN || type_id >= BT_CTF_NR_TYPE_IDS) {
+		goto end;
+	}
+
+	is_set = field_is_set_funcs[type_id](field);
+end:
+	return is_set;
+}
+
 struct bt_ctf_field *bt_ctf_field_copy(struct bt_ctf_field *field)
 {
 	int ret;
@@ -1641,6 +1687,7 @@ int bt_ctf_field_array_validate(struct bt_ctf_field *field)
 	for (i = 0; i < array->elements->len; i++) {
 		ret = bt_ctf_field_validate(array->elements->pdata[i]);
 		if (ret) {
+			fprintf(stderr, "Failed to validate array field #%zu\n", i);
 			goto end;
 		}
 	}
@@ -1664,7 +1711,7 @@ int bt_ctf_field_sequence_validate(struct bt_ctf_field *field)
 	for (i = 0; i < sequence->elements->len; i++) {
 		ret = bt_ctf_field_validate(sequence->elements->pdata[i]);
 		if (ret) {
-			fprintf(stderr, "Failed to validate sequence field %zu\n", i);
+			fprintf(stderr, "Failed to validate sequence field #%zu\n", i);
 			goto end;
 		}
 	}
@@ -1940,6 +1987,15 @@ int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
 
 		ret = bt_ctf_field_serialize(field, pos);
 		if (ret) {
+			const char *name;
+			struct bt_ctf_field_type *field_type =
+					bt_ctf_field_get_type(field);
+
+			(void) bt_ctf_field_type_structure_get_field(field_type,
+					&name, NULL, i);
+			fprintf(stderr, "Field %s failed to serialize\n",
+					name ? name : "NULL");
+			bt_put(field_type);
 			break;
 		}
 	}
@@ -1970,6 +2026,7 @@ int bt_ctf_field_array_serialize(struct bt_ctf_field *field,
 		ret = bt_ctf_field_serialize(
 			g_ptr_array_index(array->elements, i), pos);
 		if (ret) {
+			fprintf(stderr, "Failed to serialize array element #%zu\n", i);
 			goto end;
 		}
 	}
@@ -1990,6 +2047,7 @@ int bt_ctf_field_sequence_serialize(struct bt_ctf_field *field,
 		ret = bt_ctf_field_serialize(
 			g_ptr_array_index(sequence->elements, i), pos);
 		if (ret) {
+			fprintf(stderr, "Failed to serialize sequence element #%zu\n", i);
 			goto end;
 		}
 	}
@@ -2386,3 +2444,112 @@ void bt_ctf_field_freeze(struct bt_ctf_field *field)
 end:
 	return;
 }
+
+static
+bool bt_ctf_field_generic_is_set(struct bt_ctf_field *field)
+{
+	return field && field->payload_set;
+}
+
+static
+bool bt_ctf_field_enumeration_is_set(struct bt_ctf_field *field)
+{
+	bool is_set = false;
+	struct bt_ctf_field_enumeration *enumeration;
+
+	if (!field) {
+		goto end;
+	}
+
+	enumeration = container_of(field, struct bt_ctf_field_enumeration,
+			parent);
+	if (!enumeration->payload) {
+		goto end;
+	}
+
+	is_set = bt_ctf_field_is_set(enumeration->payload);
+end:
+	return is_set;
+}
+
+static
+bool bt_ctf_field_structure_is_set(struct bt_ctf_field *field)
+{
+	bool is_set = false;
+	size_t i;
+	struct bt_ctf_field_structure *structure;
+
+	if (!field) {
+		goto end;
+	}
+
+	structure = container_of(field, struct bt_ctf_field_structure, parent);
+	for (i = 0; i < structure->fields->len; i++) {
+		is_set = bt_ctf_field_is_set(structure->fields->pdata[i]);
+		if (!is_set) {
+			goto end;
+		}
+	}
+end:
+	return is_set;
+}
+
+static
+bool bt_ctf_field_variant_is_set(struct bt_ctf_field *field)
+{
+	bool is_set = false;
+	struct bt_ctf_field_variant *variant;
+
+	if (!field) {
+		goto end;
+	}
+
+	variant = container_of(field, struct bt_ctf_field_variant, parent);
+	is_set = bt_ctf_field_is_set(variant->payload);
+end:
+	return is_set;
+}
+
+static
+bool bt_ctf_field_array_is_set(struct bt_ctf_field *field)
+{
+	size_t i;
+	bool is_set = false;
+	struct bt_ctf_field_array *array;
+
+	if (!field) {
+		goto end;
+	}
+
+	array = container_of(field, struct bt_ctf_field_array, parent);
+	for (i = 0; i < array->elements->len; i++) {
+		is_set = bt_ctf_field_is_set(array->elements->pdata[i]);
+		if (!is_set) {
+			goto end;
+		}
+	}
+end:
+	return is_set;
+}
+
+static
+bool bt_ctf_field_sequence_is_set(struct bt_ctf_field *field)
+{
+	size_t i;
+	bool is_set = false;
+	struct bt_ctf_field_sequence *sequence;
+
+	if (!field) {
+		goto end;
+	}
+
+	sequence = container_of(field, struct bt_ctf_field_sequence, parent);
+	for (i = 0; i < sequence->elements->len; i++) {
+		is_set = bt_ctf_field_validate(sequence->elements->pdata[i]);
+		if (!is_set) {
+			goto end;
+		}
+	}
+end:
+	return is_set;
+}