X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=lib%2Fctf-ir%2Ffields.c;h=3ee3b9502dce12f0a45eceb1e6080b57938aced6;hb=2225de6b8f05fe96d5b85d02e82fb5bf82903f44;hp=5929b834fd07c6c43420b2435d5a8fe84e449ace;hpb=e67720a9e5a06c8050f9a7f86af6969ca35c9446;p=babeltrace.git

diff --git a/lib/ctf-ir/fields.c b/lib/ctf-ir/fields.c
index 5929b834..3ee3b950 100644
--- a/lib/ctf-ir/fields.c
+++ b/lib/ctf-ir/fields.c
@@ -39,8 +39,6 @@
 #include <babeltrace/align-internal.h>
 #include <inttypes.h>
 
-#define PACKET_LEN_INCREMENT	(getpagesize() * 8 * CHAR_BIT)
-
 static
 struct bt_ctf_field *bt_ctf_field_integer_create(struct bt_ctf_field_type *);
 static
@@ -664,7 +662,7 @@ error:
 	return ret_field;
 }
 
-int bt_ctf_field_structure_set_field(struct bt_ctf_field *field,
+int bt_ctf_field_structure_set_field_by_name(struct bt_ctf_field *field,
 		const char *name, struct bt_ctf_field *value)
 {
 	int ret = 0;
@@ -2582,25 +2580,33 @@ int bt_ctf_field_structure_serialize(struct bt_ctf_field *field,
 	for (i = 0; i < structure->fields->len; i++) {
 		struct bt_ctf_field *member = g_ptr_array_index(
 			structure->fields, i);
+		const char *field_name = NULL;
+
+		if (BT_LOG_ON_WARN) {
+			ret = bt_ctf_field_type_structure_get_field(
+				field->type, &field_name, NULL, i);
+			assert(ret == 0);
+		}
 
 		BT_LOGV("Serializing structure field's field: pos-offset=%" PRId64 ", "
 			"field-addr=%p, index=%" PRId64,
 			pos->offset, member, i);
+
+		if (!member) {
+			BT_LOGW("Cannot serialize structure field's field: field is not set: "
+				"struct-field-addr=%p, "
+				"field-name=\"%s\", index=%" PRId64,
+				field, field_name, i);
+			ret = -1;
+			goto end;
+		}
+
 		ret = bt_ctf_field_serialize(member, pos, native_byte_order);
 		if (ret) {
-			int this_ret;
-			const char *name;
-			struct bt_ctf_field_type *structure_type =
-					bt_ctf_field_get_type(field);
-
-			this_ret = bt_ctf_field_type_structure_get_field(
-				structure_type, &name, NULL, i);
-			assert(this_ret == 0);
 			BT_LOGW("Cannot serialize structure field's field: "
 				"struct-field-addr=%p, field-addr=%p, "
 				"field-name=\"%s\", index=%" PRId64,
-				field, member, name, i);
-			bt_put(structure_type);
+				field->type, member, field_name, i);
 			break;
 		}
 	}
@@ -2717,7 +2723,7 @@ int bt_ctf_field_string_serialize(struct bt_ctf_field *field,
 
 		ret = bt_ctf_field_unsigned_integer_set_value(character, chr);
 		if (ret) {
-			BT_LOGE("Cannot set character field's value: "
+			BT_LOGW("Cannot set character field's value: "
 				"pos-offset=%" PRId64 ", field-addr=%p, "
 				"index=%" PRId64 ", char-int=%" PRIu64,
 				pos->offset, character, i, chr);
@@ -2731,7 +2737,7 @@ int bt_ctf_field_string_serialize(struct bt_ctf_field *field,
 		ret = bt_ctf_field_integer_serialize(character, pos,
 			native_byte_order);
 		if (ret) {
-			BT_LOGE_STR("Cannot serialize character field.");
+			BT_LOGW_STR("Cannot serialize character field.");
 			goto end;
 		}
 	}
@@ -2823,7 +2829,7 @@ int bt_ctf_field_structure_copy(struct bt_ctf_field *src,
 		struct bt_ctf_field *field_copy = NULL;
 
 		if (field) {
-			BT_LOGD("Copying structure field's field: src-field-addr=%p",
+			BT_LOGD("Copying structure field's field: src-field-addr=%p"
 				"index=%" PRId64, field, i);
 			field_copy = bt_ctf_field_copy(field);
 			if (!field_copy) {
@@ -3059,6 +3065,8 @@ int increase_packet_size(struct bt_ctf_stream_pos *pos)
 	BT_LOGV("Increased packet size: pos-offset=%" PRId64 ", "
 		"new-packet-size=%" PRIu64,
 		pos->offset, pos->packet_size);
+	assert(pos->packet_size % 8 == 0);
+
 end:
 	return ret;
 }