X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Fctf%2Fir%2Fevent.c;h=3988b168e432551488ae8dd678109d4f13a52b44;hp=ee019ff65f0e2b89531bfab18866eceb57c00855;hb=61cf588beae752e5ddfc60b6b5310f769ac9e852;hpb=9f476966aa40bd0de2cd0654623ea03f8a3254eb

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index ee019ff6..3988b168 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -35,58 +35,130 @@
 #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/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_class_destroy(struct bt_object *obj);
 static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref);
+void bt_ctf_event_destroy(struct bt_object *obj);
 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_value *obj = NULL;
 	struct bt_ctf_event_class *event_class = NULL;
 
-	if (validate_identifier(name)) {
-		goto end;
+	if (bt_ctf_validate_identifier(name)) {
+		goto error;
 	}
 
 	event_class = g_new0(struct bt_ctf_event_class, 1);
 	if (!event_class) {
-		goto end;
+		goto error;
 	}
 
-	bt_ctf_ref_init(&event_class->ref_count);
-	event_class->name = g_quark_from_string(name);
-end:
+	bt_object_init(event_class, bt_ctf_event_class_destroy);
+	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_value_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_PUT(obj);
+
+	obj = bt_value_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_PUT(obj);
+
+	return event_class;
+
+error:
+        BT_PUT(event_class);
+	BT_PUT(obj);
 	return event_class;
 }
 
 const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 {
+	struct bt_value *obj = NULL;
 	const char *name = NULL;
 
 	if (!event_class) {
 		goto end;
 	}
 
-	name = g_quark_to_string(event_class->name);
+	obj = bt_ctf_attributes_get_field_value(event_class->attributes,
+		BT_CTF_EVENT_CLASS_ATTR_NAME_INDEX);
+	if (!obj) {
+		goto end;
+	}
+
+	if (bt_value_string_get(obj, &name)) {
+		name = NULL;
+	}
+
 end:
+	BT_PUT(obj);
 	return name;
 }
 
 int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 {
-	int64_t ret;
+	struct bt_value *obj = NULL;
+	int64_t ret = 0;
 
-	if (!event_class || !event_class->id_set) {
+	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_value_integer_get(obj, &ret)) {
+		ret = -1;
+	}
+
+	if (ret < 0) {
+		/* means ID is not set */
 		ret = -1;
 		goto end;
 	}
 
-	ret = (int64_t) event_class->id;
 end:
+	BT_PUT(obj);
 	return ret;
 }
 
@@ -94,13 +166,17 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 		uint32_t id)
 {
 	int ret = 0;
+	struct bt_value *obj = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
+
 
 	if (!event_class) {
 		ret = -1;
 		goto end;
 	}
 
-	if (event_class->stream_class) {
+	stream_class = bt_ctf_event_class_get_stream_class(event_class);
+	if (stream_class) {
 		/*
 		 * We don't allow changing the id if the event class has already
 		 * been added to a stream class.
@@ -109,25 +185,179 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	event_class->id = id;
-	event_class->id_set = 1;
+	obj = bt_ctf_attributes_get_field_value(event_class->attributes,
+		BT_CTF_EVENT_CLASS_ATTR_ID_INDEX);
+	if (!obj) {
+		goto end;
+	}
+
+	if (bt_value_integer_set(obj, id)) {
+		ret = -1;
+		goto end;
+	}
+
+end:
+	BT_PUT(obj);
+	BT_PUT(stream_class);
+	return ret;
+}
+
+int bt_ctf_event_class_set_attribute(
+		struct bt_ctf_event_class *event_class, const char *name,
+		struct bt_value *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_value_is_integer(value)) {
+			ret = -1;
+			goto end;
+		}
+	} else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri")) {
+		if (!bt_value_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_value_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_value *
+bt_ctf_event_class_get_attribute_value(struct bt_ctf_event_class *event_class,
+		int index)
+{
+	struct bt_value *ret;
+
+	if (!event_class) {
+		ret = NULL;
+		goto end;
+	}
+
+	ret = bt_ctf_attributes_get_field_value(event_class->attributes, index);
+
+end:
+	return ret;
+}
+
+struct bt_value *
+bt_ctf_event_class_get_attribute_value_by_name(
+		struct bt_ctf_event_class *event_class, const char *name)
+{
+	struct bt_value *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;
+	return (struct bt_ctf_stream_class *) bt_object_get_parent(event_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;
 	}
 
-	stream_class = event_class->stream_class;
-	bt_ctf_stream_class_get(stream_class);
+	bt_get(event_class->fields);
+	payload = event_class->fields;
 end:
-	return stream_class;
+	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_get(payload);
+	bt_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,
@@ -136,18 +366,16 @@ int bt_ctf_event_class_add_field(struct bt_ctf_event_class *event_class,
 {
 	int ret = 0;
 
-	if (!event_class || !type || validate_identifier(name) ||
+	if (!event_class || !type || bt_ctf_validate_identifier(name) ||
 		event_class->frozen) {
 		ret = -1;
 		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,
@@ -166,6 +394,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;
@@ -182,6 +416,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:
@@ -198,6 +438,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;
@@ -222,7 +467,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_context_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(event_class->context);
+	bt_get(event_class->context);
 	context_type = event_class->context;
 end:
 	return context_type;
@@ -244,8 +489,8 @@ int bt_ctf_event_class_set_context_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(context);
-	bt_ctf_field_type_put(event_class->context);
+	bt_get(context);
+	bt_put(event_class->context);
 	event_class->context = context;
 end:
 	return ret;
@@ -254,69 +499,98 @@ end:
 
 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);
+	bt_get(event_class);
 }
 
 void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
 {
-	if (!event_class) {
-		return;
+	bt_put(event_class);
+}
+
+BT_HIDDEN
+int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
+		uint32_t stream_id)
+{
+	int ret = 0;
+	struct bt_value *obj;
+
+	obj = bt_value_integer_create_init(stream_id);
+
+	if (!obj) {
+		ret = -1;
+		goto end;
 	}
 
-	bt_ctf_ref_put(&event_class->ref_count, bt_ctf_event_class_destroy);
+	ret = bt_ctf_attributes_set_field_value(event_class->attributes,
+		"stream_id", obj);
+
+end:
+	BT_PUT(obj);
+	return ret;
 }
 
 struct bt_ctf_event *bt_ctf_event_create(struct bt_ctf_event_class *event_class)
 {
 	struct bt_ctf_event *event = NULL;
+	struct bt_ctf_stream_class *stream_class = NULL;
 
 	if (!event_class) {
-		goto end;
+		goto error;
 	}
 
+	stream_class = bt_ctf_event_class_get_stream_class(event_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;
+	}
+	assert(stream_class->event_header_type);
 	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_object_init(event, bt_ctf_event_destroy);
 	bt_ctf_event_class_freeze(event_class);
-	event->event_class = event_class;
-
-	assert(event_class->stream_class);
-	assert(event_class->stream_class->event_header_type);
+	/*
+	 * 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->event_header = bt_ctf_field_create(
-		event_class->stream_class->event_header_type);
+		stream_class->event_header_type);
 	if (!event->event_header) {
-		goto error_destroy;
+		goto error;
 	}
 	if (event_class->context) {
 		event->context_payload = bt_ctf_field_create(
 			event_class->context);
 		if (!event->context_payload) {
-			goto error_destroy;
+			goto error;
 		}
 	}
 	event->fields_payload = bt_ctf_field_create(event_class->fields);
 	if (!event->fields_payload) {
-		goto error_destroy;
+		goto error;
 	}
-end:
+
 	/*
 	 * Freeze the stream class since the event header must not be changed
 	 * anymore.
 	 */
-	bt_ctf_stream_class_freeze(event_class->stream_class);
+	bt_ctf_stream_class_freeze(stream_class);
+	BT_PUT(stream_class);
+	return event;
+error:
+	BT_PUT(event);
+	BT_PUT(stream_class);
 	return event;
-error_destroy:
-	bt_ctf_event_destroy(&event->ref_count);
-	return NULL;
 }
 
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
@@ -328,11 +602,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;
@@ -359,41 +638,106 @@ 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 (payload_type == event->event_class->fields) {
+			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) != CTF_TYPE_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;
 }
@@ -413,7 +757,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;
@@ -423,45 +767,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) {
-		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 (field_type != stream_class->event_header_type) {
 		ret = -1;
 		goto end;
 	}
 
-	bt_ctf_field_get(header);
-	bt_ctf_field_put(event->event_header);
+	bt_get(header);
+	bt_put(event->event_header);
 	event->event_header = header;
 end:
-	if (field_type) {
-		bt_ctf_field_type_put(field_type);
-	}
+	bt_put(stream_class);
+	bt_put(field_type);
 	return ret;
 }
 
@@ -475,7 +815,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;
 }
@@ -497,80 +837,57 @@ int bt_ctf_event_set_event_context(struct bt_ctf_event *event,
 		goto end;
 	}
 
-	bt_ctf_field_get(context);
-	bt_ctf_field_put(event->context_payload);
+	bt_get(context);
+	bt_put(event->context_payload);
 	event->context_payload = 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);
+	bt_get(event);
 }
 
 void bt_ctf_event_put(struct bt_ctf_event *event)
 {
-	if (!event) {
-		return;
-	}
-
-	bt_ctf_ref_put(&event->ref_count, bt_ctf_event_destroy);
+	bt_put(event);
 }
 
 static
-void bt_ctf_event_class_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_event_class_destroy(struct bt_object *obj)
 {
 	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->context) {
-		bt_ctf_field_type_put(event_class->context);
-	}
-	if (event_class->fields) {
-		bt_ctf_field_type_put(event_class->fields);
-	}
+	event_class = container_of(obj, struct bt_ctf_event_class, base);
+	bt_ctf_attributes_destroy(event_class->attributes);
+	bt_put(event_class->context);
+	bt_put(event_class->fields);
 	g_free(event_class);
 }
 
 static
-void bt_ctf_event_destroy(struct bt_ctf_ref *ref)
+void bt_ctf_event_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_event *event;
 
-	if (!ref) {
-		return;
-	}
-
-	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);
+	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->context_payload);
+	bt_put(event->fields_payload);
 	g_free(event);
 }
 
@@ -613,7 +930,7 @@ int set_integer_field_value(struct bt_ctf_field* field, uint64_t value)
 		}
 	}
 end:
-	bt_ctf_field_type_put(field_type);
+	bt_put(field_type);
 	return ret;
 }
 
@@ -624,60 +941,83 @@ void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
 	event_class->frozen = 1;
 	bt_ctf_field_type_freeze(event_class->context);
 	bt_ctf_field_type_freeze(event_class->fields);
-}
-
-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 ret = 0;
-
-	if (!event_class) {
-		ret = -1;
-		goto end;
-	}
-
-	/* Allow a NULL stream_class to unset the current stream_class */
-	if (stream_class && event_class->stream_class) {
-		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.
-	 */
-end:
-	return ret;
+	bt_ctf_attributes_freeze(event_class->attributes);
 }
 
 BT_HIDDEN
 int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 		struct metadata_context *context)
 {
+	int i;
+	int count;
 	int ret = 0;
-	int64_t stream_id;
+	struct bt_value *attr_value = NULL;
 
 	assert(event_class);
 	assert(context);
-	stream_id = bt_ctf_stream_class_get_id(event_class->stream_class);
-	if (stream_id < 0) {
+
+	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) {
 		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);
+	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_value_get_type(attr_value)) {
+		case BT_VALUE_TYPE_INTEGER:
+		{
+			int64_t value;
+
+			ret = bt_value_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_VALUE_TYPE_STRING:
+		{
+			const char *value;
+
+			ret = bt_value_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_PUT(attr_value);
+	}
 
 	if (event_class->context) {
 		g_string_append(context->string, "\tcontext := ");
@@ -701,9 +1041,24 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 	g_string_append(context->string, "};\n\n");
 end:
 	context->current_indentation_level = 0;
+	BT_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)
 {
@@ -753,30 +1108,6 @@ end:
 	return ret;
 }
 
-BT_HIDDEN
-int bt_ctf_event_set_timestamp(struct bt_ctf_event *event,
-		uint64_t timestamp)
-{
-	int ret = 0;
-
-	assert(event);
-	if (event->timestamp) {
-		ret = -1;
-		goto end;
-	}
-
-	event->timestamp = timestamp;
-end:
-	return ret;
-}
-
-BT_HIDDEN
-uint64_t bt_ctf_event_get_timestamp(struct bt_ctf_event *event)
-{
-	assert(event);
-	return event->timestamp;
-}
-
 BT_HIDDEN
 int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 {
@@ -791,7 +1122,8 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 	id_field = bt_ctf_field_structure_get_field(event->event_header, "id");
 	if (id_field) {
 		ret = set_integer_field_value(id_field,
-			(uint64_t) event->event_class->id);
+			(uint64_t) bt_ctf_event_class_get_id(
+				event->event_class));
 		if (ret) {
 			goto end;
 		}
@@ -800,18 +1132,80 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 	timestamp_field = bt_ctf_field_structure_get_field(event->event_header,
 		"timestamp");
 	if (timestamp_field) {
-		ret = set_integer_field_value(timestamp_field,
-			(uint64_t) event->timestamp);
-		if (ret) {
-			goto end;
+		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:
-	if (id_field) {
-		bt_ctf_field_put(id_field);
+	bt_put(id_field);
+	bt_put(timestamp_field);
+	return ret;
+}
+
+struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event)
+{
+	struct bt_ctf_event *copy = NULL;
+
+	if (!event) {
+		goto error;
 	}
-	if (timestamp_field) {
-		bt_ctf_field_put(timestamp_field);
+
+	copy = g_new0(struct bt_ctf_event, 1);
+	if (!copy) {
+		goto error;
 	}
-	return ret;
+
+	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->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;
 }