X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;ds=sidebyside;f=formats%2Fctf%2Fir%2Fevent.c;h=6d8f57b3e076f7da718e6b1cdd9c87eab80780bb;hb=5fd2e9fda6185e989583e6e61b9312683149747e;hp=58c9c494b5c355a0bcf333b438226828fe723da3;hpb=074ee56d5037489d6e10c49d3e7d2cfdf94857bb;p=babeltrace.git

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 58c9c494..6d8f57b3 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -26,228 +26,214 @@
  * SOFTWARE.
  */
 
-#include <babeltrace/ctf-writer/event.h>
-#include <babeltrace/ctf-writer/event-types.h>
-#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/ctf-ir/fields-internal.h>
+#include <babeltrace/ctf-ir/field-types-internal.h>
 #include <babeltrace/ctf-ir/event-internal.h>
+#include <babeltrace/ctf-ir/event-class.h>
+#include <babeltrace/ctf-ir/event-class-internal.h>
 #include <babeltrace/ctf-ir/stream-class.h>
+#include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
+#include <babeltrace/ctf-ir/validation-internal.h>
+#include <babeltrace/ctf-ir/utils.h>
+#include <babeltrace/ref.h>
+#include <babeltrace/ctf-ir/attributes-internal.h>
 #include <babeltrace/compiler.h>
 
 static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_event_destroy(struct bt_object *obj);
 static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref);
+int set_integer_field_value(struct bt_ctf_field *field, uint64_t value);
 
-struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
-{
-	struct bt_ctf_event_class *event_class = NULL;
-
-	if (validate_identifier(name)) {
-		goto end;
-	}
-
-	event_class = g_new0(struct bt_ctf_event_class, 1);
-	if (!event_class) {
-		goto end;
-	}
-
-	bt_ctf_ref_init(&event_class->ref_count);
-	event_class->name = g_quark_from_string(name);
-end:
-	return event_class;
-}
-
-const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
+struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 {
-	const char *name = NULL;
+	int ret;
+	enum bt_ctf_validation_flag validation_flags =
+		BT_CTF_VALIDATION_FLAG_STREAM |
+		BT_CTF_VALIDATION_FLAG_EVENT;
+	struct bt_ctf_event *event = NULL;
+	struct bt_ctf_trace *trace = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
+	struct bt_ctf_field_type *packet_header_type = NULL;
+	struct bt_ctf_field_type *packet_context_type = NULL;
+	struct bt_ctf_field_type *event_header_type = NULL;
+	struct bt_ctf_field_type *stream_event_ctx_type = NULL;
+	struct bt_ctf_field_type *event_context_type = NULL;
+	struct bt_ctf_field_type *event_payload_type = NULL;
+	struct bt_ctf_field *event_header = NULL;
+	struct bt_ctf_field *stream_event_context = NULL;
+	struct bt_ctf_field *event_context = NULL;
+	struct bt_ctf_field *event_payload = NULL;
+	struct bt_value *environment = NULL;
+	struct bt_ctf_validation_output validation_output = { 0 };
+	int trace_valid = 0;
 
 	if (!event_class) {
-		goto end;
+		goto error;
 	}
 
-	name = g_quark_to_string(event_class->name);
-end:
-	return name;
-}
-
-int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
-{
-	int64_t ret;
-
-	if (!event_class || !event_class->id_set) {
-		ret = -1;
-		goto end;
-	}
-
-	ret = (int64_t) event_class->id;
-end:
-	return ret;
-}
-
-int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
-		uint32_t id)
-{
-	int ret = 0;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
-	}
+	stream_class = bt_ctf_event_class_get_stream_class(event_class);
 
-	if (event_class->stream_class) {
+	/*
+	 * We disallow the creation of an event if its event class has not been
+	 * associated to a stream class.
+	 */
+	if (!stream_class) {
+		goto error;
+	}
+
+	/* A stream class should always have an existing event header type */
+	assert(stream_class->event_header_type);
+
+	/* The event class was frozen when added to its stream class */
+	assert(event_class->frozen);
+
+	/* Validate the trace (if any), the stream class, and the event class */
+	trace = bt_ctf_stream_class_get_trace(stream_class);
+	if (trace) {
+		packet_header_type = bt_ctf_trace_get_packet_header_type(trace);
+		trace_valid = trace->valid;
+		assert(trace_valid);
+		environment = trace->environment;
+	}
+
+	packet_context_type = bt_ctf_stream_class_get_packet_context_type(
+		stream_class);
+	event_header_type = bt_ctf_stream_class_get_event_header_type(
+		stream_class);
+	stream_event_ctx_type = bt_ctf_stream_class_get_event_context_type(
+		stream_class);
+	event_context_type = bt_ctf_event_class_get_context_type(event_class);
+	event_payload_type = bt_ctf_event_class_get_payload_type(event_class);
+	ret = bt_ctf_validate_class_types(environment, packet_header_type,
+		packet_context_type, event_header_type, stream_event_ctx_type,
+		event_context_type, event_payload_type, trace_valid,
+		stream_class->valid, event_class->valid,
+		&validation_output, validation_flags);
+	BT_PUT(packet_header_type);
+	BT_PUT(packet_context_type);
+	BT_PUT(event_header_type);
+	BT_PUT(stream_event_ctx_type);
+	BT_PUT(event_context_type);
+	BT_PUT(event_payload_type);
+	if (ret) {
 		/*
-		 * We don't allow changing the id if the event class has already
-		 * been added to a stream class.
+		 * This means something went wrong during the validation
+		 * process, not that the objects are invalid.
 		 */
-		ret = -1;
-		goto end;
-	}
-
-	event_class->id = id;
-	event_class->id_set = 1;
-end:
-	return ret;
-}
-
-struct bt_ctf_stream_class *bt_ctf_event_class_get_stream_class(
-		struct bt_ctf_event_class *event_class)
-{
-	struct bt_ctf_stream_class *stream_class = NULL;
-
-	if (!event_class) {
-		goto end;
+		goto error;
 	}
 
-	stream_class = event_class->stream_class;
-	bt_ctf_stream_class_get(stream_class);
-end:
-	return stream_class;
-}
-
-int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
-		struct bt_ctf_field_type *type,
-		const char *name)
-{
-	int ret = 0;
-
-	if (!event_class || !type || validate_identifier(name) ||
-		event_class->frozen) {
-		ret = -1;
-		goto end;
+	if ((validation_output.valid_flags & validation_flags) !=
+			validation_flags) {
+		/* Invalid trace/stream class/event class */
+		goto error;
 	}
 
-	if (!event_class->fields) {
-		event_class->fields = bt_ctf_field_type_structure_create();
-		if (!event_class->fields) {
-			ret = -1;
-			goto end;
-		}
-	}
-
-	ret = bt_ctf_field_type_structure_add_field(event_class->fields,
-		type, name);
-end:
-	return ret;
-}
-
-int bt_ctf_event_class_get_field_count(
-		struct bt_ctf_event_class *event_class)
-{
-	int ret;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
+	/*
+	 * At this point we know the trace (if associated to the stream
+	 * class), the stream class, and the event class, with their
+	 * current types, are valid. We may proceed with creating
+	 * the event.
+	 */
+	event = g_new0(struct bt_ctf_event, 1);
+	if (!event) {
+		goto error;
 	}
 
-	ret = bt_ctf_field_type_structure_get_field_count(event_class->fields);
-end:
-	return ret;
-}
-
-int bt_ctf_event_class_get_field(struct bt_ctf_event_class *event_class,
-		const char **field_name, struct bt_ctf_field_type **field_type,
-		int index)
-{
-	int ret;
+	bt_object_init(event, bt_ctf_event_destroy);
 
-	if (!event_class || index < 0) {
-		ret = -1;
-		goto end;
+	/*
+	 * event does not share a common ancestor with the event class; it has
+	 * to guarantee its existence by holding a reference. This reference
+	 * shall be released once the event is associated to a stream since,
+	 * from that point, the event and its class will share the same
+	 * lifetime.
+	 */
+	event->event_class = bt_get(event_class);
+	event_header =
+		bt_ctf_field_create(validation_output.event_header_type);
+	if (!event_header) {
+		goto error;
+	}
+
+	if (validation_output.stream_event_ctx_type) {
+		stream_event_context = bt_ctf_field_create(
+			validation_output.stream_event_ctx_type);
+		if (!stream_event_context) {
+			goto error;
+		}
 	}
 
-	ret = bt_ctf_field_type_structure_get_field(event_class->fields,
-		field_name, field_type, index);
-end:
-	return ret;
-}
-
-struct bt_ctf_field_type *bt_ctf_event_class_get_field_by_name(
-		struct bt_ctf_event_class *event_class, const char *name)
-{
-	GQuark name_quark;
-	struct bt_ctf_field_type *field_type = NULL;
-
-	if (!event_class || !name) {
-		goto end;
+	if (validation_output.event_context_type) {
+		event_context = bt_ctf_field_create(
+			validation_output.event_context_type);
+		if (!event_context) {
+			goto error;
+		}
 	}
 
-	name_quark = g_quark_try_string(name);
-	if (!name_quark) {
-		goto end;
+	if (validation_output.event_payload_type) {
+		event_payload = bt_ctf_field_create(
+			validation_output.event_payload_type);
+		if (!event_payload) {
+			goto error;
+		}
 	}
 
 	/*
-	 * No need to increment field_type's reference count since getting it
-	 * from the structure already does.
+	 * At this point all the fields are created, potentially from
+	 * validated copies of field types, so that the field types and
+	 * fields can be replaced in the trace, stream class,
+	 * event class, and created event.
 	 */
-	field_type = bt_ctf_field_type_structure_get_field_type_by_name(
-		event_class->fields, name);
-end:
-	return field_type;
-}
+	bt_ctf_validation_replace_types(trace, stream_class,
+		event_class, &validation_output, validation_flags);
+	BT_MOVE(event->event_header, event_header);
+	BT_MOVE(event->stream_event_context, stream_event_context);
+	BT_MOVE(event->context_payload, event_context);
+	BT_MOVE(event->fields_payload, event_payload);
 
-void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class)
-{
-	if (!event_class) {
-		return;
-	}
-
-	bt_ctf_ref_get(&event_class->ref_count);
-}
+	/*
+	 * Put what was not moved in bt_ctf_validation_replace_types().
+	 */
+	bt_ctf_validation_output_put_types(&validation_output);
 
-void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
-{
-	if (!event_class) {
-		return;
-	}
+	/*
+	 * Freeze the stream class since the event header must not be changed
+	 * anymore.
+	 */
+	bt_ctf_stream_class_freeze(stream_class);
 
-	bt_ctf_ref_put(&event_class->ref_count, bt_ctf_event_class_destroy);
-}
+	/*
+	 * Mark stream class, and event class as valid since
+	 * they're all frozen now.
+	 */
+	stream_class->valid = 1;
+	event_class->valid = 1;
 
-struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
-{
-	struct bt_ctf_event *event = NULL;
+	/* Put stuff we borrowed from the event class */
+	BT_PUT(stream_class);
+	BT_PUT(trace);
 
-	if (!event_class) {
-		goto end;
-	}
+	return event;
 
-	event = g_new0(struct bt_ctf_event, 1);
-	if (!event) {
-		goto end;
-	}
+error:
+	bt_ctf_validation_output_put_types(&validation_output);
+	BT_PUT(event);
+	BT_PUT(stream_class);
+	BT_PUT(trace);
+	BT_PUT(event_header);
+	BT_PUT(stream_event_context);
+	BT_PUT(event_context);
+	BT_PUT(event_payload);
+	assert(!packet_header_type);
+	assert(!packet_context_type);
+	assert(!event_header_type);
+	assert(!stream_event_ctx_type);
+	assert(!event_context_type);
+	assert(!event_payload_type);
 
-	bt_ctf_ref_init(&event->ref_count);
-	bt_ctf_event_class_get(event_class);
-	bt_ctf_event_class_freeze(event_class);
-	event->event_class = event_class;
-	event->context_payload = bt_ctf_field_create(event_class->context);
-	event->fields_payload = bt_ctf_field_create(event_class->fields);
-end:
 	return event;
 }
 
@@ -260,11 +246,16 @@ struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
 	}
 
 	event_class = event->event_class;
-	bt_ctf_event_class_get(event_class);
+	bt_get(event_class);
 end:
 	return event_class;
 }
 
+struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
+{
+	return (struct bt_ctf_stream *) bt_object_get_parent(event);
+}
+
 struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
 {
 	struct bt_ctf_clock *clock = NULL;
@@ -291,41 +282,109 @@ struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
 	}
 
 error_put_stream_class:
-	bt_ctf_stream_class_put(stream_class);
+	bt_put(stream_class);
 error_put_event_class:
-	bt_ctf_event_class_put(event_class);
+	bt_put(event_class);
 end:
 	return clock;
 }
 
 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 || 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 (bt_ctf_field_type_compare(payload_type,
+				event->event_class->fields) == 0) {
+			bt_put(event->fields_payload);
+			bt_get(payload);
+			event->fields_payload = payload;
+		} else {
+			ret = -1;
+		}
+
+		bt_put(payload_type);
+	}
 end:
 	return ret;
 }
 
+struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event)
+{
+	struct bt_ctf_field *payload = NULL;
+
+	if (!event || !event->fields_payload) {
+		goto end;
+	}
+
+	payload = event->fields_payload;
+	bt_get(payload);
+end:
+	return payload;
+}
+
+int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
+		struct bt_ctf_field *payload)
+{
+	int ret = 0;
+	struct bt_ctf_field_type *payload_type = NULL;
+
+	if (!event || !payload) {
+		ret = -1;
+		goto end;
+	}
+
+	payload_type = bt_ctf_field_get_type(payload);
+	if (!payload_type) {
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_get_type_id(payload_type) !=
+			BT_CTF_TYPE_ID_STRUCT) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_get(payload);
+	bt_put(event->fields_payload);
+	event->fields_payload = payload;
+
+end:
+	bt_put(payload_type);
+	return ret;
+}
 
 struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 		const char *name)
 {
 	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_get(field);
+	}
 end:
 	return field;
 }
@@ -345,143 +404,215 @@ end:
 	return field;
 }
 
-void bt_ctf_event_get(struct bt_ctf_event *event)
+struct bt_ctf_field *bt_ctf_event_get_header(
+		struct bt_ctf_event *event)
 {
-	if (!event) {
-		return;
+	struct bt_ctf_field *header = NULL;
+
+	if (!event || !event->event_header) {
+		goto end;
 	}
 
-	bt_ctf_ref_get(&event->ref_count);
+	header = event->event_header;
+	bt_get(header);
+end:
+	return header;
 }
 
-void bt_ctf_event_put(struct bt_ctf_event *event)
+int bt_ctf_event_set_header(struct bt_ctf_event *event,
+		struct bt_ctf_field *header)
 {
-	if (!event) {
-		return;
+	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
+
+	if (!event || !header) {
+		ret = -1;
+		goto end;
+	}
+
+	stream_class = (struct bt_ctf_stream_class *) bt_object_get_parent(
+		event->event_class);
+	/*
+	 * Ensure the provided header's type matches the one registered to the
+	 * stream class.
+	 */
+	field_type = bt_ctf_field_get_type(header);
+	if (bt_ctf_field_type_compare(field_type,
+			stream_class->event_header_type)) {
+		ret = -1;
+		goto end;
 	}
 
-	bt_ctf_ref_put(&event->ref_count, bt_ctf_event_destroy);
+	bt_get(header);
+	bt_put(event->event_header);
+	event->event_header = header;
+end:
+	bt_put(stream_class);
+	bt_put(field_type);
+	return ret;
 }
 
-static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref)
+struct bt_ctf_field *bt_ctf_event_get_event_context(
+		struct bt_ctf_event *event)
 {
-	struct bt_ctf_event_class *event_class;
+	struct bt_ctf_field *context = NULL;
 
-	if (!ref) {
-		return;
+	if (!event || !event->context_payload) {
+		goto end;
 	}
 
-	/*
-	 * Don't call put() on the stream class. See comment in
-	 * bt_ctf_event_class_set_stream_class for explanation.
-	 */
-	event_class = container_of(ref, struct bt_ctf_event_class, ref_count);
-	bt_ctf_field_type_put(event_class->context);
-	bt_ctf_field_type_put(event_class->fields);
-	g_free(event_class);
+	context = event->context_payload;
+	bt_get(context);
+end:
+	return context;
 }
 
-static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref)
+int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
+		struct bt_ctf_field *context)
 {
-	struct bt_ctf_event *event;
+	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
 
-	if (!ref) {
-		return;
+	if (!event || !context) {
+		ret = -1;
+		goto end;
 	}
 
-	event = container_of(ref, struct bt_ctf_event,
-		ref_count);
-	bt_ctf_event_class_put(event->event_class);
-	bt_ctf_field_put(event->context_payload);
-	bt_ctf_field_put(event->fields_payload);
-	g_free(event);
+	field_type = bt_ctf_field_get_type(context);
+	if (bt_ctf_field_type_compare(field_type,
+			event->event_class->context)) {
+		ret = -1;
+		goto end;
+	}
+
+	bt_get(context);
+	bt_put(event->context_payload);
+	event->context_payload = context;
+end:
+	bt_put(field_type);
+	return ret;
 }
 
-BT_HIDDEN
-void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
+struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
+		struct bt_ctf_event *event)
 {
-	assert(event_class);
-	event_class->frozen = 1;
-	bt_ctf_field_type_freeze(event_class->context);
-	bt_ctf_field_type_freeze(event_class->fields);
+	struct bt_ctf_field *stream_event_context = NULL;
+
+	if (!event || !event->stream_event_context) {
+		goto end;
+	}
+
+	stream_event_context = event->stream_event_context;
+end:
+	return bt_get(stream_event_context);
 }
 
-BT_HIDDEN
-int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class,
-		struct bt_ctf_stream_class *stream_class)
+int bt_ctf_event_set_stream_event_context(struct bt_ctf_event *event,
+		struct bt_ctf_field *stream_event_context)
 {
 	int ret = 0;
+	struct bt_ctf_field_type *field_type = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
 
-	if (!event_class) {
+	if (!event || !stream_event_context) {
 		ret = -1;
 		goto end;
 	}
 
-	/* Allow a NULL stream_class to unset the current stream_class */
-	if (stream_class && event_class->stream_class) {
+	stream_class = bt_ctf_event_class_get_stream_class(event->event_class);
+	/*
+	 * We should not have been able to create the event without associating
+	 * the event class to a stream class.
+	 */
+	assert(stream_class);
+
+	field_type = bt_ctf_field_get_type(stream_event_context);
+	if (bt_ctf_field_type_compare(field_type,
+			stream_class->event_context_type)) {
 		ret = -1;
 		goto end;
 	}
 
-	event_class->stream_class = stream_class;
-	/*
-	 * We don't get() the stream_class since doing so would introduce
-	 * a circular ownership between event classes and stream classes.
-	 *
-	 * A stream class will always unset itself from its events before
-	 * being destroyed. This ensures that a user won't get a pointer
-	 * to a stale stream class instance from an event class.
-	 */
+	bt_get(stream_event_context);
+	BT_MOVE(event->stream_event_context, stream_event_context);
 end:
+	BT_PUT(stream_class);
+	bt_put(field_type);
 	return ret;
 }
 
-BT_HIDDEN
-int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
-		struct metadata_context *context)
+void bt_ctf_event_get(struct bt_ctf_event *event)
+{
+	bt_get(event);
+}
+
+void bt_ctf_event_put(struct bt_ctf_event *event)
+{
+	bt_put(event);
+}
+
+void bt_ctf_event_destroy(struct bt_object *obj)
+{
+	struct bt_ctf_event *event;
+
+	event = container_of(obj, struct bt_ctf_event, base);
+	if (!event->base.parent) {
+		/*
+		 * Event was keeping a reference to its class since it shared no
+		 * common ancestor with it to guarantee they would both have the
+		 * same lifetime.
+		 */
+		bt_put(event->event_class);
+	}
+	bt_put(event->event_header);
+	bt_put(event->stream_event_context);
+	bt_put(event->context_payload);
+	bt_put(event->fields_payload);
+	g_free(event);
+}
+
+static
+int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
 {
 	int ret = 0;
-	int64_t stream_id;
+	struct bt_ctf_field_type *field_type = NULL;
 
-	assert(event_class);
-	assert(context);
-	stream_id = bt_ctf_stream_class_get_id(event_class->stream_class);
-	if (stream_id < 0) {
+	if (!field) {
 		ret = -1;
 		goto end;
 	}
 
-	context->current_indentation_level = 1;
-	g_string_assign(context->field_name, "");
-	g_string_append_printf(context->string, "event {\n\tname = \"%s\";\n\tid = %u;\n\tstream_id = %" PRId64 ";\n",
-		g_quark_to_string(event_class->name),
-		event_class->id,
-		stream_id);
+	if (!bt_ctf_field_validate(field)) {
+		/* Payload already set, skip! (not an error) */
+		goto end;
+	}
+
+	field_type = bt_ctf_field_get_type(field);
+	assert(field_type);
 
-	if (event_class->context) {
-		g_string_append(context->string, "\tcontext := ");
-		ret = bt_ctf_field_type_serialize(event_class->context,
-			context);
+	if (bt_ctf_field_type_get_type_id(field_type) !=
+			BT_CTF_TYPE_ID_INTEGER) {
+		/* Not an integer and the value is unset, error. */
+		ret = -1;
+		goto end;
+	}
+
+	if (bt_ctf_field_type_integer_get_signed(field_type)) {
+		ret = bt_ctf_field_signed_integer_set_value(field, (int64_t) value);
 		if (ret) {
+			/* Value is out of range, error. */
 			goto end;
 		}
-		g_string_append(context->string, ";\n");
-	}
-
-	if (event_class->fields) {
-		g_string_append(context->string, "\tfields := ");
-		ret = bt_ctf_field_type_serialize(event_class->fields, context);
+	} else {
+		ret = bt_ctf_field_unsigned_integer_set_value(field, value);
 		if (ret) {
+			/* Value is out of range, error. */
 			goto end;
 		}
-		g_string_append(context->string, ";\n");
 	}
-
-	g_string_append(context->string, "};\n\n");
 end:
-	context->current_indentation_level = 0;
+	bt_put(field_type);
 	return ret;
 }
 
@@ -490,8 +621,27 @@ int bt_ctf_event_validate(struct bt_ctf_event *event)
 {
 	/* Make sure each field's payload has been set */
 	int ret;
+	struct bt_ctf_stream_class *stream_class = NULL;
 
 	assert(event);
+	ret = bt_ctf_field_validate(event->event_header);
+	if (ret) {
+		goto end;
+	}
+
+	stream_class = bt_ctf_event_class_get_stream_class(event->event_class);
+	/*
+	 * We should not have been able to create the event without associating
+	 * the event class to a stream class.
+	 */
+	assert(stream_class);
+	if (stream_class->event_context_type) {
+		ret = bt_ctf_field_validate(event->stream_event_context);
+		if (ret) {
+			goto end;
+		}
+	}
+
 	ret = bt_ctf_field_validate(event->fields_payload);
 	if (ret) {
 		goto end;
@@ -501,6 +651,7 @@ int bt_ctf_event_validate(struct bt_ctf_event *event)
 		ret = bt_ctf_field_validate(event->context_payload);
 	}
 end:
+	bt_put(stream_class);
 	return ret;
 }
 
@@ -530,25 +681,108 @@ end:
 }
 
 BT_HIDDEN
-int bt_ctf_event_set_timestamp(struct bt_ctf_event *event,
-		uint64_t timestamp)
+int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 {
 	int ret = 0;
+	struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL;
 
-	assert(event);
-	if (event->timestamp) {
+	if (!event) {
 		ret = -1;
 		goto end;
 	}
 
-	event->timestamp = timestamp;
+	id_field = bt_ctf_field_structure_get_field(event->event_header, "id");
+	if (id_field) {
+		ret = set_integer_field_value(id_field,
+			(uint64_t) bt_ctf_event_class_get_id(
+				event->event_class));
+		if (ret) {
+			goto end;
+		}
+	}
+
+	timestamp_field = bt_ctf_field_structure_get_field(event->event_header,
+		"timestamp");
+	if (timestamp_field) {
+		struct bt_ctf_field_type *timestamp_field_type =
+			bt_ctf_field_get_type(timestamp_field);
+		struct bt_ctf_clock *mapped_clock;
+
+		assert(timestamp_field_type);
+		mapped_clock = bt_ctf_field_type_integer_get_mapped_clock(
+			timestamp_field_type);
+		bt_put(timestamp_field_type);
+		if (mapped_clock) {
+			int64_t timestamp;
+
+			ret = bt_ctf_clock_get_time(mapped_clock, &timestamp);
+			bt_put(mapped_clock);
+			if (ret) {
+				goto end;
+			}
+
+			ret = set_integer_field_value(timestamp_field,
+				timestamp);
+			if (ret) {
+				goto end;
+			}
+		}
+	}
 end:
+	bt_put(id_field);
+	bt_put(timestamp_field);
 	return ret;
 }
 
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event)
+struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event)
 {
-	assert(event);
-	return event->timestamp;
+	struct bt_ctf_event *copy = NULL;
+
+	if (!event) {
+		goto error;
+	}
+
+	copy = g_new0(struct bt_ctf_event, 1);
+	if (!copy) {
+		goto error;
+	}
+
+	bt_object_init(copy, bt_ctf_event_destroy);
+	copy->event_class = bt_get(event->event_class);
+
+	if (event->event_header) {
+		copy->event_header = bt_ctf_field_copy(event->event_header);
+		if (!copy->event_header) {
+			goto error;
+		}
+	}
+
+	if (event->stream_event_context) {
+		copy->stream_event_context =
+			bt_ctf_field_copy(event->stream_event_context);
+		if (!copy->stream_event_context) {
+			goto error;
+		}
+	}
+
+	if (event->context_payload) {
+		copy->context_payload = bt_ctf_field_copy(
+			event->context_payload);
+		if (!copy->context_payload) {
+			goto error;
+		}
+	}
+
+	if (event->fields_payload) {
+		copy->fields_payload = bt_ctf_field_copy(event->fields_payload);
+		if (!copy->fields_payload) {
+			goto error;
+		}
+	}
+
+	return copy;
+
+error:
+	BT_PUT(copy);
+	return copy;
 }