X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=2c1dad47500b1480569369ab581d776bb9933ee1;hb=c5a9aa19ea52f76f02747d9688d5d044b4a1b545;hp=c4fe4b4870726a0310a4abdf5b4fc9834ad680cc;hpb=3fa759e9c931b5dd3766f38c3c5bbfc26b1d590a;p=babeltrace.git

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index c4fe4b48..2c1dad47 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -59,6 +59,13 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 	}
 
 	bt_ctf_ref_init(&event_class->ref_count);
+	event_class->fields = bt_ctf_field_type_structure_create();
+	if (!event_class->fields) {
+		bt_ctf_event_class_put(event_class);
+		event_class = NULL;
+		goto end;
+	}
+
 	event_class->name = g_quark_from_string(name);
 end:
 	return event_class;
@@ -131,6 +138,38 @@ end:
 	return stream_class;
 }
 
+struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
+		struct bt_ctf_event_class *event_class)
+{
+	struct bt_ctf_field_type *payload = NULL;
+
+	if (!event_class) {
+		goto end;
+	}
+
+	bt_ctf_field_type_get(event_class->fields);
+	payload = event_class->fields;
+end:
+	return payload;
+}
+
+int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
+		struct bt_ctf_field_type *payload)
+{
+	int ret = 0;
+
+	if (!event_class || !payload) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_ctf_field_type_get(payload);
+	bt_ctf_field_type_put(event_class->fields);
+	event_class->fields = payload;
+end:
+	return ret;
+}
+
 int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
 		struct bt_ctf_field_type *type,
 		const char *name)
@@ -143,12 +182,10 @@ int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	if (!event_class->fields) {
-		event_class->fields = bt_ctf_field_type_structure_create();
-		if (!event_class->fields) {
-			ret = -1;
-			goto end;
-		}
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
 	}
 
 	ret = bt_ctf_field_type_structure_add_field(event_class->fields,
@@ -167,6 +204,12 @@ int bt_ctf_event_class_get_field_count(
 		goto end;
 	}
 
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
 	ret = bt_ctf_field_type_structure_get_field_count(event_class->fields);
 end:
 	return ret;
@@ -183,6 +226,12 @@ int bt_ctf_event_class_get_field(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
 	ret = bt_ctf_field_type_structure_get_field(event_class->fields,
 		field_name, field_type, index);
 end:
@@ -199,6 +248,11 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name(
 		goto end;
 	}
 
+	if (bt_ctf_field_type_get_type_id(event_class->fields) !=
+		CTF_TYPE_STRUCT) {
+		goto end;
+	}
+
 	name_quark = g_quark_try_string(name);
 	if (!name_quark) {
 		goto end;
@@ -378,17 +432,32 @@ end:
 
 int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 		const char *name,
-		struct bt_ctf_field *value)
+		struct bt_ctf_field *payload)
 {
 	int ret = 0;
 
-	if (!event || !value || bt_ctf_validate_identifier(name)) {
+	if (!event || !payload) {
 		ret = -1;
 		goto end;
 	}
 
-	ret = bt_ctf_field_structure_set_field(event->fields_payload,
-		name, value);
+	if (name) {
+		ret = bt_ctf_field_structure_set_field(event->fields_payload,
+			name, payload);
+	} else {
+		struct bt_ctf_field_type *payload_type;
+
+		payload_type = bt_ctf_field_get_type(payload);
+		if (payload_type == event->event_class->fields) {
+			bt_ctf_field_put(event->fields_payload);
+			bt_ctf_field_get(payload);
+			event->fields_payload = payload;
+		} else {
+			ret = -1;
+		}
+
+		bt_ctf_field_type_put(payload_type);
+	}
 end:
 	return ret;
 }
@@ -399,11 +468,17 @@ struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 {
 	struct bt_ctf_field *field = NULL;
 
-	if (!event || !name) {
+	if (!event) {
 		goto end;
 	}
 
-	field = bt_ctf_field_structure_get_field(event->fields_payload, name);
+	if (name) {
+		field = bt_ctf_field_structure_get_field(event->fields_payload,
+			name);
+	} else {
+		field = event->fields_payload;
+		bt_ctf_field_get(field);
+	}
 end:
 	return field;
 }