X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=c553f7a707eff35e4d4a024a91128a675583215b;hb=f3985ab106d89d8e764c1a8dd0c8bda09b755d10;hp=d8def6252464919cea9790dcc4972bc33b1e4138;hpb=b8248cc00f72ac2448c697c76033c8862d8db673;p=babeltrace.git

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index d8def625..c553f7a7 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -26,580 +26,220 @@
  * 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/clock-class.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/stream-internal.h>
+#include <babeltrace/ctf-ir/packet.h>
+#include <babeltrace/ctf-ir/packet-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
+#include <babeltrace/ctf-ir/validation-internal.h>
+#include <babeltrace/ctf-ir/packet-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);
-static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref);
-static
-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)
-{
-	int ret;
-	struct bt_object *obj = NULL;
-	struct bt_ctf_event_class *event_class = NULL;
-
-	if (bt_ctf_validate_identifier(name)) {
-		goto error;
-	}
-
-	event_class = g_new0(struct bt_ctf_event_class, 1);
-	if (!event_class) {
-		goto error;
-	}
-
-	bt_ctf_ref_init(&event_class->ref_count);
-	event_class->fields = bt_ctf_field_type_structure_create();
-	if (!event_class->fields) {
-		goto error;
-	}
-
-	event_class->attributes = bt_ctf_attributes_create();
-	if (!event_class->attributes) {
-		goto error;
-	}
-
-	obj = bt_object_integer_create_init(-1);
-	if (!obj) {
-		goto error;
-	}
-
-	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
-		"id", obj);
-	if (ret) {
-		goto error;
-	}
-
-	BT_OBJECT_PUT(obj);
-
-	obj = bt_object_string_create_init(name);
-	if (!obj) {
-		goto error;
-	}
-
-	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
-		"name", obj);
-	if (ret) {
-		goto error;
-	}
-
-	BT_OBJECT_PUT(obj);
-
-	return event_class;
-
-error:
-	if (event_class) {
-		bt_ctf_event_class_put(event_class);
-	}
-
-	BT_OBJECT_PUT(obj);
-
-	return NULL;
-}
-
-const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
-{
-	struct bt_object *obj = NULL;
-	const char *name = NULL;
-
-	if (!event_class) {
-		goto end;
-	}
-
-	obj = bt_ctf_attributes_get_field_value(event_class->attributes,
-		BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX);
-	if (!obj) {
-		goto end;
-	}
-
-	if (bt_object_string_get(obj, &name)) {
-		name = NULL;
-	}
-
-end:
-	BT_OBJECT_PUT(obj);
-
-	return name;
-}
-
-int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
-{
-	struct bt_object *obj = NULL;
-	int64_t ret;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
-	}
-
-	obj = bt_ctf_attributes_get_field_value(event_class->attributes,
-		BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
-	if (!obj) {
-		goto end;
-	}
-
-	if (bt_object_integer_get(obj, &ret)) {
-		ret = -1;
-	}
-
-	if (ret < 0) {
-		/* means ID is not set */
-		ret = -1;
-		goto end;
-	}
-
-end:
-	BT_OBJECT_PUT(obj);
-
-	return ret;
-}
-
-int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
-		uint32_t id)
-{
-	int ret = 0;
-	struct bt_object *obj = NULL;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
-	}
-
-	if (event_class->stream_class) {
-		/*
-		 * We don't allow changing the id if the event class has already
-		 * been added to a stream class.
-		 */
-		ret = -1;
-		goto end;
-	}
-
-	obj = bt_ctf_attributes_get_field_value(event_class->attributes,
-		BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
-	if (!obj) {
-		goto end;
-	}
-
-	if (bt_object_integer_set(obj, id)) {
-		ret = -1;
-		goto end;
-	}
-
-end:
-	BT_OBJECT_PUT(obj);
-
-	return ret;
-}
-
-int bt_ctf_event_class_set_attribute(
-		struct bt_ctf_event_class *event_class, const char *name,
-		struct bt_object *value)
-{
-	int ret = 0;
-
-	if (!event_class || !name || !value || event_class->frozen) {
-		ret = -1;
-		goto end;
-	}
-
-	if (!strcmp(name, "id") || !strcmp(name, "loglevel")) {
-		if (!bt_object_is_integer(value)) {
-			ret = -1;
-			goto end;
-		}
-	} else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri")) {
-		if (!bt_object_is_string(value)) {
-			ret = -1;
-			goto end;
-		}
-	} else {
-		/* unknown attribute */
-		ret = -1;
-		goto end;
-	}
-
-	/* "id" special case: >= 0 */
-	if (!strcmp(name, "id")) {
-		int64_t val;
-
-		ret = bt_object_integer_get(value, &val);
-
-		if (ret) {
-			goto end;
-		}
-
-		if (val < 0) {
-			ret = -1;
-			goto end;
-		}
-	}
-
-	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
-		name, value);
-
-end:
-	return ret;
-}
-
-int bt_ctf_event_class_get_attribute_count(
-		struct bt_ctf_event_class *event_class)
-{
-	int ret = 0;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
-	}
-
-	ret = bt_ctf_attributes_get_count(event_class->attributes);
-
-end:
-	return ret;
-}
-
-const char *
-bt_ctf_event_class_get_attribute_name(
-		struct bt_ctf_event_class *event_class, int index)
-{
-	const char *ret;
-
-	if (!event_class) {
-		ret = NULL;
-		goto end;
-	}
-
-	ret = bt_ctf_attributes_get_field_name(event_class->attributes, index);
-
-end:
-	return ret;
-}
-
-struct bt_object *
-bt_ctf_event_class_get_attribute_value(struct bt_ctf_event_class *event_class,
-		int index)
-{
-	struct bt_object *ret;
-
-	if (!event_class) {
-		ret = NULL;
-		goto end;
-	}
-
-	ret = bt_ctf_attributes_get_field_value(event_class->attributes, index);
-
-end:
-	return ret;
-}
-
-struct bt_object *
-bt_ctf_event_class_get_attribute_value_by_name(
-		struct bt_ctf_event_class *event_class, const char *name)
-{
-	struct bt_object *ret;
-
-	if (!event_class || !name) {
-		ret = NULL;
-		goto end;
-	}
-
-	ret = bt_ctf_attributes_get_field_value_by_name(event_class->attributes,
-		name);
-
-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;
-	}
-
-	stream_class = event_class->stream_class;
-	bt_ctf_stream_class_get(stream_class);
-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 ||
-		bt_ctf_field_type_get_type_id(payload) != CTF_TYPE_STRUCT) {
-		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)
-{
-	int ret = 0;
-
-	if (!event_class || !type || bt_ctf_validate_identifier(name) ||
-		event_class->frozen) {
-		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,
-		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;
-	}
-
-	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;
-}
-
-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;
-
-	if (!event_class || index < 0) {
-		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_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 (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;
-	}
-
-	/*
-	 * No need to increment field_type's reference count since getting it
-	 * from the structure already does.
-	 */
-	field_type = bt_ctf_field_type_structure_get_field_type_by_name(
-		event_class->fields, name);
-end:
-	return field_type;
-}
-
-struct bt_ctf_field_type *bt_ctf_event_class_get_context_type(
-		struct bt_ctf_event_class *event_class)
-{
-	struct bt_ctf_field_type *context_type = NULL;
-
-	if (!event_class || !event_class->context) {
-		goto end;
-	}
-
-	bt_ctf_field_type_get(event_class->context);
-	context_type = event_class->context;
-end:
-	return context_type;
-}
-
-int bt_ctf_event_class_set_context_type(
-		struct bt_ctf_event_class *event_class,
-		struct bt_ctf_field_type *context)
-{
-	int ret = 0;
-
-	if (!event_class || !context || event_class->frozen) {
-		ret = -1;
-		goto end;
-	}
-
-	if (bt_ctf_field_type_get_type_id(context) != CTF_TYPE_STRUCT) {
-		ret = -1;
-		goto end;
-	}
-
-	bt_ctf_field_type_get(context);
-	bt_ctf_field_type_put(event_class->context);
-	event_class->context = context;
-end:
-	return ret;
-
-}
-
-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);
-}
-
-void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
-{
-	if (!event_class) {
-		return;
-	}
-
-	bt_ctf_ref_put(&event_class->ref_count, bt_ctf_event_class_destroy);
-}
+void bt_ctf_event_destroy(struct bt_object *obj);
 
 struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 {
 	int ret;
-	struct bt_object *obj = NULL;
+	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;
 	}
 
+	stream_class = bt_ctf_event_class_get_stream_class(event_class);
+
 	/*
-	 * The event class does not keep ownership of the stream class to
-	 * which it as been added. Therefore, it can't assume it has been
-	 * set. However, we disallow the creation of an event if its
-	 * associated stream class has been reclaimed.
+	 * We disallow the creation of an event if its event class has not been
+	 * associated to a stream class.
 	 */
-	if (!event_class->stream_class) {
-		goto end;
+	if (!stream_class) {
+		goto error;
 	}
-	assert(event_class->stream_class->event_header_type);
 
-	/* set "stream_id" attribute now that we know its value */
-	obj = bt_object_integer_create_init(event_class->stream_class->id);
-	if (!obj) {
-		goto end;
+	/* 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) {
+		/*
+		 * This means something went wrong during the validation
+		 * process, not that the objects are invalid.
+		 */
+		goto error;
 	}
 
-	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
-		"stream_id", obj);
-	BT_OBJECT_PUT(obj);
-
-	if (ret) {
-		goto end;
+	if ((validation_output.valid_flags & validation_flags) !=
+			validation_flags) {
+		/* Invalid trace/stream class/event class */
+		goto error;
 	}
 
+	/*
+	 * 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 end;
+		goto error;
 	}
 
-	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;
+	bt_object_init(event, bt_ctf_event_destroy);
 
-	event->event_header = bt_ctf_field_create(
-		event_class->stream_class->event_header_type);
-	if (!event->event_header) {
-		goto error_destroy;
+	/*
+	 * 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->clock_values = g_hash_table_new_full(g_direct_hash,
+			g_direct_equal, bt_put, bt_put);
+	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;
+		}
 	}
-	if (event_class->context) {
-		event->context_payload = bt_ctf_field_create(
-			event_class->context);
-		if (!event->context_payload) {
-			goto error_destroy;
+
+	if (validation_output.event_context_type) {
+		event_context = bt_ctf_field_create(
+			validation_output.event_context_type);
+		if (!event_context) {
+			goto error;
 		}
 	}
-	event->fields_payload = bt_ctf_field_create(event_class->fields);
-	if (!event->fields_payload) {
-		goto error_destroy;
+
+	if (validation_output.event_payload_type) {
+		event_payload = bt_ctf_field_create(
+			validation_output.event_payload_type);
+		if (!event_payload) {
+			goto error;
+		}
 	}
 
+	/*
+	 * 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.
+	 */
+	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);
+
+	/*
+	 * Put what was not moved in bt_ctf_validation_replace_types().
+	 */
+	bt_ctf_validation_output_put_types(&validation_output);
+
 	/*
 	 * Freeze the stream class since the event header must not be changed
 	 * anymore.
 	 */
-	bt_ctf_stream_class_freeze(event_class->stream_class);
-end:
+	bt_ctf_stream_class_freeze(stream_class);
+
+	/*
+	 * Mark stream class, and event class as valid since
+	 * they're all frozen now.
+	 */
+	stream_class->valid = 1;
+	event_class->valid = 1;
+
+	/* Put stuff we borrowed from the event class */
+	BT_PUT(stream_class);
+	BT_PUT(trace);
+
 	return event;
-error_destroy:
-	if (event) {
-		bt_ctf_event_destroy(&event->ref_count);
-	}
 
-	return NULL;
+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);
+
+	return event;
 }
 
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
@@ -611,42 +251,34 @@ 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_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
+struct bt_ctf_stream *bt_ctf_event_get_stream(struct bt_ctf_event *event)
 {
-	struct bt_ctf_clock *clock = NULL;
-	struct bt_ctf_event_class *event_class;
-	struct bt_ctf_stream_class *stream_class;
+	struct bt_ctf_stream *stream = NULL;
 
 	if (!event) {
 		goto end;
 	}
 
-	event_class = bt_ctf_event_get_class(event);
-	if (!event_class) {
-		goto end;
-	}
-
-	stream_class = bt_ctf_event_class_get_stream_class(event_class);
-	if (!stream_class) {
-		goto error_put_event_class;
-	}
-
-	clock = bt_ctf_stream_class_get_clock(stream_class);
-	if (!clock) {
-		goto error_put_stream_class;
+	/*
+	 * If the event has a parent, then this is its (writer) stream.
+	 * If the event has no parent, then if it has a packet, this
+	 * is its (non-writer) stream.
+	 */
+	if (event->base.parent) {
+		stream = (struct bt_ctf_stream *) bt_object_get_parent(event);
+	} else {
+		if (event->packet) {
+			stream = bt_get(event->packet->stream);
+		}
 	}
 
-error_put_stream_class:
-	bt_ctf_stream_class_put(stream_class);
-error_put_event_class:
-	bt_ctf_event_class_put(event_class);
 end:
-	return clock;
+	return stream;
 }
 
 int bt_ctf_event_set_payload(struct bt_ctf_event *event,
@@ -655,7 +287,7 @@ int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 {
 	int ret = 0;
 
-	if (!event || !payload) {
+	if (!event || !payload || event->frozen) {
 		ret = -1;
 		goto end;
 	}
@@ -667,20 +299,65 @@ int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 		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);
+
+		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_ctf_field_type_put(payload_type);
+		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 || event->frozen) {
+		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_put(event->fields_payload);
+	event->fields_payload = bt_get(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)
@@ -696,7 +373,7 @@ struct bt_ctf_field *bt_ctf_event_get_payload(struct bt_ctf_event *event,
 			name);
 	} else {
 		field = event->fields_payload;
-		bt_ctf_field_get(field);
+		bt_get(field);
 	}
 end:
 	return field;
@@ -717,7 +394,7 @@ end:
 	return field;
 }
 
-struct bt_ctf_field *bt_ctf_event_get_event_header(
+struct bt_ctf_field *bt_ctf_event_get_header(
 		struct bt_ctf_event *event)
 {
 	struct bt_ctf_field *header = NULL;
@@ -727,45 +404,41 @@ struct bt_ctf_field *bt_ctf_event_get_event_header(
 	}
 
 	header = event->event_header;
-	bt_ctf_field_get(header);
+	bt_get(header);
 end:
 	return header;
 }
 
-int bt_ctf_event_set_event_header(struct bt_ctf_event *event,
+int bt_ctf_event_set_header(struct bt_ctf_event *event,
 		struct bt_ctf_field *header)
 {
 	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;
-	}
-
-	/* Could be NULL since an event class doesn't own a stream class */
-	if (!event->event_class->stream_class) {
+	if (!event || event->frozen) {
 		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 (field_type != event->event_class->stream_class->event_header_type) {
+	if (bt_ctf_field_type_compare(field_type,
+			stream_class->event_header_type)) {
 		ret = -1;
 		goto end;
 	}
 
-	bt_ctf_field_get(header);
-	bt_ctf_field_put(event->event_header);
-	event->event_header = header;
+	bt_put(event->event_header);
+	event->event_header = bt_get(header);
 end:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(stream_class);
+	bt_put(field_type);
 	return ret;
 }
 
@@ -779,7 +452,7 @@ struct bt_ctf_field *bt_ctf_event_get_event_context(
 	}
 
 	context = event->context_payload;
-	bt_ctf_field_get(context);
+	bt_get(context);
 end:
 	return context;
 }
@@ -790,300 +463,146 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
 	int ret = 0;
 	struct bt_ctf_field_type *field_type = NULL;
 
-	if (!event || !context) {
+	if (!event || event->frozen) {
 		ret = -1;
 		goto end;
 	}
 
 	field_type = bt_ctf_field_get_type(context);
-	if (field_type != event->event_class->context) {
+	if (bt_ctf_field_type_compare(field_type,
+			event->event_class->context)) {
 		ret = -1;
 		goto end;
 	}
 
-	bt_ctf_field_get(context);
-	bt_ctf_field_put(event->context_payload);
-	event->context_payload = context;
+	bt_put(event->context_payload);
+	event->context_payload = bt_get(context);
 end:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(field_type);
 	return ret;
 }
 
-void bt_ctf_event_get(struct bt_ctf_event *event)
-{
-	if (!event) {
-		return;
-	}
-
-	bt_ctf_ref_get(&event->ref_count);
-}
-
-void bt_ctf_event_put(struct bt_ctf_event *event)
-{
-	if (!event) {
-		return;
-	}
-
-	bt_ctf_ref_put(&event->ref_count, bt_ctf_event_destroy);
-}
-
-static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref)
-{
-	struct bt_ctf_event_class *event_class;
-
-	if (!ref) {
-		return;
-	}
-
-	/*
-	 * 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);
-	if (event_class->attributes) {
-		bt_ctf_attributes_destroy(event_class->attributes);
-	}
-	if (event_class->context) {
-		bt_ctf_field_type_put(event_class->context);
-	}
-	if (event_class->fields) {
-		bt_ctf_field_type_put(event_class->fields);
-	}
-	g_free(event_class);
-}
-
-static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref)
+struct bt_ctf_field *bt_ctf_event_get_stream_event_context(
+		struct bt_ctf_event *event)
 {
-	struct bt_ctf_event *event;
+	struct bt_ctf_field *stream_event_context = NULL;
 
-	if (!ref) {
-		return;
+	if (!event || !event->stream_event_context) {
+		goto end;
 	}
 
-	event = container_of(ref, struct bt_ctf_event,
-		ref_count);
-	if (event->event_class) {
-		bt_ctf_event_class_put(event->event_class);
-	}
-	if (event->event_header) {
-		bt_ctf_field_put(event->event_header);
-	}
-	if (event->context_payload) {
-		bt_ctf_field_put(event->context_payload);
-	}
-	if (event->fields_payload) {
-		bt_ctf_field_put(event->fields_payload);
-	}
-	g_free(event);
+	stream_event_context = event->stream_event_context;
+end:
+	return bt_get(stream_event_context);
 }
 
-static
-int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
+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 (!field) {
+	if (!event || event->frozen) {
 		ret = -1;
 		goto end;
 	}
 
-	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);
+	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 (bt_ctf_field_type_get_type_id(field_type) != CTF_TYPE_INTEGER) {
-		/* Not an integer and the value is unset, error. */
+	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;
 	}
 
-	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;
-		}
-	} else {
-		ret = bt_ctf_field_unsigned_integer_set_value(field, value);
-		if (ret) {
-			/* Value is out of range, error. */
-			goto end;
-		}
-	}
+	bt_get(stream_event_context);
+	BT_MOVE(event->stream_event_context, stream_event_context);
 end:
-	bt_ctf_field_type_put(field_type);
+	BT_PUT(stream_class);
+	bt_put(field_type);
 	return ret;
 }
 
-BT_HIDDEN
-void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
+void bt_ctf_event_get(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);
-	bt_ctf_attributes_freeze(event_class->attributes);
+	bt_get(event);
 }
 
-BT_HIDDEN
-int bt_ctf_event_class_set_stream_class(struct bt_ctf_event_class *event_class,
-		struct bt_ctf_stream_class *stream_class)
+void bt_ctf_event_put(struct bt_ctf_event *event)
 {
-	int ret = 0;
+	bt_put(event);
+}
 
-	if (!event_class) {
-		ret = -1;
+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);
+	}
+	g_hash_table_destroy(event->clock_values);
+	bt_put(event->event_header);
+	bt_put(event->stream_event_context);
+	bt_put(event->context_payload);
+	bt_put(event->fields_payload);
+	bt_put(event->packet);
+	g_free(event);
+}
+
+struct bt_ctf_clock_value *bt_ctf_event_get_clock_value(
+		struct bt_ctf_event *event, struct bt_ctf_clock_class *clock_class)
+{
+	struct bt_ctf_clock_value *clock_value = NULL;
+
+	if (!event || !clock_class) {
 		goto end;
 	}
 
-	/* Allow a NULL stream_class to unset the current stream_class */
-	if (stream_class && event_class->stream_class) {
-		ret = -1;
+	clock_value = g_hash_table_lookup(event->clock_values, clock_class);
+	if (!clock_value) {
 		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(clock_value);
 end:
-	return ret;
+	return clock_value;
 }
 
-BT_HIDDEN
-int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
-		struct metadata_context *context)
+int bt_ctf_event_set_clock_value(struct bt_ctf_event *event,
+		struct bt_ctf_clock_value *value)
 {
-	int i;
-	int count;
 	int ret = 0;
-	struct bt_object *attr_value = NULL;
-
-	assert(event_class);
-	assert(context);
 
-	context->current_indentation_level = 1;
-	g_string_assign(context->field_name, "");
-	g_string_append(context->string, "event {\n");
-	count = bt_ctf_event_class_get_attribute_count(event_class);
-
-	if (count < 0) {
+	if (!event || !value || event->frozen) {
 		ret = -1;
 		goto end;
 	}
 
-	for (i = 0; i < count; ++i) {
-		const char *attr_name = NULL;
-
-		attr_name = bt_ctf_event_class_get_attribute_name(
-			event_class, i);
-		attr_value = bt_ctf_event_class_get_attribute_value(
-			event_class, i);
-
-		if (!attr_name || !attr_value) {
-			ret = -1;
-			goto end;
-		}
-
-		switch (bt_object_get_type(attr_value)) {
-		case BT_OBJECT_TYPE_INTEGER:
-		{
-			int64_t value;
-
-			ret = bt_object_integer_get(attr_value, &value);
-
-			if (ret) {
-				goto end;
-			}
-
-			g_string_append_printf(context->string,
-				"\t%s = %" PRId64 ";\n", attr_name, value);
-			break;
-		}
-
-		case BT_OBJECT_TYPE_STRING:
-		{
-			const char *value;
-
-			ret = bt_object_string_get(attr_value, &value);
-
-			if (ret) {
-				goto end;
-			}
-
-			g_string_append_printf(context->string,
-				"\t%s = \"%s\";\n", attr_name, value);
-			break;
-		}
-
-		default:
-			/* should never happen */
-			assert(false);
-			break;
-		}
-
-		BT_OBJECT_PUT(attr_value);
-	}
-
-	if (event_class->context) {
-		g_string_append(context->string, "\tcontext := ");
-		ret = bt_ctf_field_type_serialize(event_class->context,
-			context);
-		if (ret) {
-			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);
-		if (ret) {
-			goto end;
-		}
-		g_string_append(context->string, ";\n");
-	}
-
-	g_string_append(context->string, "};\n\n");
+	g_hash_table_insert(event->clock_values,
+		bt_ctf_clock_value_get_class(value), bt_get(value));
 end:
-	context->current_indentation_level = 0;
-	BT_OBJECT_PUT(attr_value);
 	return ret;
 }
 
-void bt_ctf_event_class_set_native_byte_order(
-		struct bt_ctf_event_class *event_class,
-		int byte_order)
-{
-	if (!event_class) {
-		return;
-	}
-
-	bt_ctf_field_type_set_native_byte_order(event_class->context,
-		byte_order);
-	bt_ctf_field_type_set_native_byte_order(event_class->fields,
-		byte_order);
-}
-
 BT_HIDDEN
 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);
@@ -1091,6 +610,19 @@ int bt_ctf_event_validate(struct bt_ctf_event *event)
 		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;
@@ -1100,6 +632,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;
 }
 
@@ -1128,60 +661,76 @@ end:
 	return ret;
 }
 
-BT_HIDDEN
-int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
+struct bt_ctf_packet *bt_ctf_event_get_packet(struct bt_ctf_event *event)
+{
+	struct bt_ctf_packet *packet = NULL;
+
+	if (!event || !event->packet) {
+		goto end;
+	}
+
+	packet = bt_get(event->packet);
+end:
+	return packet;
+}
+
+int bt_ctf_event_set_packet(struct bt_ctf_event *event,
+		struct bt_ctf_packet *packet)
 {
+	struct bt_ctf_stream_class *event_stream_class = NULL;
+	struct bt_ctf_stream_class *packet_stream_class = NULL;
+	struct bt_ctf_stream *stream = NULL;
 	int ret = 0;
-	struct bt_ctf_field *id_field = NULL, *timestamp_field = NULL;
 
-	if (!event) {
+	if (!event || !packet || event->frozen) {
 		ret = -1;
 		goto end;
 	}
 
-	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) {
+	/*
+	 * Make sure the new packet was created by this event's
+	 * stream, if it is set.
+	 */
+	stream = bt_ctf_event_get_stream(event);
+	if (stream) {
+		if (packet->stream != stream) {
+			ret = -1;
 			goto end;
 		}
-	}
+	} else {
+		event_stream_class =
+			bt_ctf_event_class_get_stream_class(event->event_class);
+		packet_stream_class =
+			bt_ctf_stream_get_class(packet->stream);
+
+		assert(event_stream_class);
+		assert(packet_stream_class);
 
-	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_ctf_field_type_put(timestamp_field_type);
-		if (mapped_clock) {
-			uint64_t timestamp = bt_ctf_clock_get_time(
-				mapped_clock);
-
-			bt_ctf_clock_put(mapped_clock);
-			if (timestamp == (uint64_t) -1ULL) {
-				goto end;
-			}
-
-			ret = set_integer_field_value(timestamp_field,
-				timestamp);
-			if (ret) {
-				goto end;
-			}
+		if (event_stream_class != packet_stream_class) {
+			ret = -1;
+			goto end;
 		}
 	}
+
+	bt_get(packet);
+	BT_MOVE(event->packet, packet);
+
 end:
-	if (id_field) {
-		bt_ctf_field_put(id_field);
-	}
-	if (timestamp_field) {
-		bt_ctf_field_put(timestamp_field);
-	}
+	BT_PUT(stream);
+	BT_PUT(event_stream_class);
+	BT_PUT(packet_stream_class);
+
 	return ret;
 }
+
+BT_HIDDEN
+void bt_ctf_event_freeze(struct bt_ctf_event *event)
+{
+	assert(event);
+	bt_ctf_packet_freeze(event->packet);
+	bt_ctf_field_freeze(event->event_header);
+	bt_ctf_field_freeze(event->stream_event_context);
+	bt_ctf_field_freeze(event->context_payload);
+	bt_ctf_field_freeze(event->fields_payload);
+	event->frozen = 1;
+}