X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fstream.c;h=93982b3b48b13796a61f194862f1bc30a04c0b44;hb=662e778c1c251b8ab256f572913b12b819679d32;hp=1d14abd69a76ba2de62c8bd320553b493f1c70ce;hpb=5d161ecc2079b67e0350715dc531ea684257a8ae;p=babeltrace.git

diff --git a/formats/ctf/ir/stream.c b/formats/ctf/ir/stream.c
index 1d14abd6..93982b3b 100644
--- a/formats/ctf/ir/stream.c
+++ b/formats/ctf/ir/stream.c
@@ -508,6 +508,11 @@ int bt_ctf_stream_append_event(struct bt_ctf_stream *stream,
 		goto end;
 	}
 
+	ret = bt_ctf_event_populate_event_header(event);
+	if (ret) {
+		goto end;
+	}
+
 	/* Make sure the event's payload is set */
 	ret = bt_ctf_event_validate(event);
 	if (ret) {
@@ -680,7 +685,6 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
 	int ret = 0;
 	size_t i;
 	uint64_t timestamp_begin, timestamp_end, events_discarded;
-	struct bt_ctf_stream_class *stream_class;
 	struct bt_ctf_field *integer = NULL;
 	struct ctf_stream_pos packet_context_pos;
 
@@ -710,7 +714,6 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
 		goto end;
 	}
 
-	stream_class = stream->stream_class;
 	timestamp_begin = ((struct bt_ctf_event *) g_ptr_array_index(
 		stream->events, 0))->timestamp;
 	timestamp_end = ((struct bt_ctf_event *) g_ptr_array_index(
@@ -776,24 +779,24 @@ int bt_ctf_stream_flush(struct bt_ctf_stream *stream)
 			event->event_class);
 		uint64_t timestamp = bt_ctf_event_get_timestamp(event);
 
-		ret = bt_ctf_field_reset(stream_class->event_header);
+		ret = bt_ctf_field_reset(event->event_header);
 		if (ret) {
 			goto end;
 		}
 
-		ret = set_structure_field_integer(stream_class->event_header,
+		ret = set_structure_field_integer(event->event_header,
 			"id", event_id);
 		if (ret) {
 			goto end;
 		}
-		ret = set_structure_field_integer(stream_class->event_header,
+		ret = set_structure_field_integer(event->event_header,
 			"timestamp", timestamp);
 		if (ret) {
 			goto end;
 		}
 
 		/* Write event header */
-		ret = bt_ctf_field_serialize(stream_class->event_header,
+		ret = bt_ctf_field_serialize(event->event_header,
 			&stream->pos);
 		if (ret) {
 			goto end;