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

diff --git a/formats/ctf/ir/event.c b/formats/ctf/ir/event.c
index 6cb9f2d5..3988b168 100644
--- a/formats/ctf/ir/event.c
+++ b/formats/ctf/ir/event.c
@@ -36,22 +36,21 @@
 #include <babeltrace/ctf-ir/stream-class-internal.h>
 #include <babeltrace/ctf-ir/trace-internal.h>
 #include <babeltrace/ctf-ir/utils.h>
-#include <babeltrace/ctf-ir/common-internal.h>
-#include <babeltrace/ctf-ir/ref.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_ref *ref);
+void bt_ctf_event_class_destroy(struct bt_object *obj);
 static
-void bt_ctf_event_destroy(struct bt_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_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	struct bt_ctf_event_class *event_class = NULL;
 
 	if (bt_ctf_validate_identifier(name)) {
@@ -63,7 +62,7 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	bt_ctf_base_init(event_class, bt_ctf_event_class_destroy);
+	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;
@@ -74,7 +73,7 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	obj = bt_object_integer_create_init(-1);
+	obj = bt_value_integer_create_init(-1);
 	if (!obj) {
 		goto error;
 	}
@@ -85,9 +84,9 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	BT_OBJECT_PUT(obj);
+	BT_PUT(obj);
 
-	obj = bt_object_string_create_init(name);
+	obj = bt_value_string_create_init(name);
 	if (!obj) {
 		goto error;
 	}
@@ -98,23 +97,19 @@ struct bt_ctf_event_class *bt_ctf_event_class_create(const char *name)
 		goto error;
 	}
 
-	BT_OBJECT_PUT(obj);
+	BT_PUT(obj);
 
 	return event_class;
 
 error:
-	if (event_class) {
-		bt_ctf_event_class_put(event_class);
-	}
-
-	BT_OBJECT_PUT(obj);
-
-	return NULL;
+        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_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	const char *name = NULL;
 
 	if (!event_class) {
@@ -127,19 +122,18 @@ const char *bt_ctf_event_class_get_name(struct bt_ctf_event_class *event_class)
 		goto end;
 	}
 
-	if (bt_object_string_get(obj, &name)) {
+	if (bt_value_string_get(obj, &name)) {
 		name = NULL;
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	BT_PUT(obj);
 	return name;
 }
 
 int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 {
-	struct bt_object *obj = NULL;
+	struct bt_value *obj = NULL;
 	int64_t ret = 0;
 
 	if (!event_class) {
@@ -153,7 +147,7 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 		goto end;
 	}
 
-	if (bt_object_integer_get(obj, &ret)) {
+	if (bt_value_integer_get(obj, &ret)) {
 		ret = -1;
 	}
 
@@ -164,8 +158,7 @@ int64_t bt_ctf_event_class_get_id(struct bt_ctf_event_class *event_class)
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	BT_PUT(obj);
 	return ret;
 }
 
@@ -173,14 +166,17 @@ 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;
+	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.
@@ -195,20 +191,20 @@ int bt_ctf_event_class_set_id(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	if (bt_object_integer_set(obj, id)) {
+	if (bt_value_integer_set(obj, id)) {
 		ret = -1;
 		goto end;
 	}
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	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_object *value)
+		struct bt_value *value)
 {
 	int ret = 0;
 
@@ -218,12 +214,12 @@ int bt_ctf_event_class_set_attribute(
 	}
 
 	if (!strcmp(name, "id") || !strcmp(name, "loglevel")) {
-		if (!bt_object_is_integer(value)) {
+		if (!bt_value_is_integer(value)) {
 			ret = -1;
 			goto end;
 		}
 	} else if (!strcmp(name, "name") || !strcmp(name, "model.emf.uri")) {
-		if (!bt_object_is_string(value)) {
+		if (!bt_value_is_string(value)) {
 			ret = -1;
 			goto end;
 		}
@@ -237,7 +233,7 @@ int bt_ctf_event_class_set_attribute(
 	if (!strcmp(name, "id")) {
 		int64_t val;
 
-		ret = bt_object_integer_get(value, &val);
+		ret = bt_value_integer_get(value, &val);
 
 		if (ret) {
 			goto end;
@@ -289,11 +285,11 @@ end:
 	return ret;
 }
 
-struct bt_object *
+struct bt_value *
 bt_ctf_event_class_get_attribute_value(struct bt_ctf_event_class *event_class,
 		int index)
 {
-	struct bt_object *ret;
+	struct bt_value *ret;
 
 	if (!event_class) {
 		ret = NULL;
@@ -306,11 +302,11 @@ end:
 	return ret;
 }
 
-struct bt_object *
+struct bt_value *
 bt_ctf_event_class_get_attribute_value_by_name(
 		struct bt_ctf_event_class *event_class, const char *name)
 {
-	struct bt_object *ret;
+	struct bt_value *ret;
 
 	if (!event_class || !name) {
 		ret = NULL;
@@ -328,16 +324,7 @@ end:
 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;
+	return (struct bt_ctf_stream_class *) bt_object_get_parent(event_class);
 }
 
 struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
@@ -349,7 +336,7 @@ struct bt_ctf_field_type *bt_ctf_event_class_get_payload_type(
 		goto end;
 	}
 
-	bt_ctf_field_type_get(event_class->fields);
+	bt_get(event_class->fields);
 	payload = event_class->fields;
 end:
 	return payload;
@@ -366,8 +353,8 @@ int bt_ctf_event_class_set_payload_type(struct bt_ctf_event_class *event_class,
 		goto end;
 	}
 
-	bt_ctf_field_type_get(payload);
-	bt_ctf_field_type_put(event_class->fields);
+	bt_get(payload);
+	bt_put(event_class->fields);
 	event_class->fields = payload;
 end:
 	return ret;
@@ -480,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;
@@ -502,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;
@@ -512,12 +499,12 @@ end:
 
 void bt_ctf_event_class_get(struct bt_ctf_event_class *event_class)
 {
-	bt_ctf_get(event_class);
+	bt_get(event_class);
 }
 
 void bt_ctf_event_class_put(struct bt_ctf_event_class *event_class)
 {
-	bt_ctf_put(event_class);
+	bt_put(event_class);
 }
 
 BT_HIDDEN
@@ -525,9 +512,9 @@ int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
 		uint32_t stream_id)
 {
 	int ret = 0;
-	struct bt_object *obj;
+	struct bt_value *obj;
 
-	obj = bt_object_integer_create_init(stream_id);
+	obj = bt_value_integer_create_init(stream_id);
 
 	if (!obj) {
 		ret = -1;
@@ -538,69 +525,72 @@ int bt_ctf_event_class_set_stream_id(struct bt_ctf_event_class *event_class,
 		"stream_id", obj);
 
 end:
-	BT_OBJECT_PUT(obj);
-
+	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);
 	/*
-	 * 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);
+	assert(stream_class->event_header_type);
 	event = g_new0(struct bt_ctf_event, 1);
 	if (!event) {
-		goto end;
+		goto error;
 	}
 
-	bt_ctf_base_init(event, bt_ctf_event_destroy);
-	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;
+	/*
+	 * 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;
 	}
 
 	/*
 	 * 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);
+	BT_PUT(stream_class);
+	return event;
+error:
+	BT_PUT(event);
+	BT_PUT(stream_class);
 	return event;
-error_destroy:
-	if (event) {
-		bt_ctf_event_destroy(&event->base.ref_count);
-	}
-
-	return NULL;
 }
 
 struct bt_ctf_event_class *bt_ctf_event_get_class(struct bt_ctf_event *event)
@@ -612,25 +602,14 @@ 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)
 {
-	struct bt_ctf_stream *stream = NULL;
-
-	if (!event) {
-		goto end;
-	}
-
-	stream = event->stream;
-	if (stream) {
-		bt_ctf_stream_get(stream);
-	}
-end:
-	return stream;
+	return (struct bt_ctf_stream *) bt_object_get_parent(event);
 }
 
 struct bt_ctf_clock *bt_ctf_event_get_clock(struct bt_ctf_event *event)
@@ -659,9 +638,9 @@ 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;
 }
@@ -685,14 +664,14 @@ int bt_ctf_event_set_payload(struct bt_ctf_event *event,
 
 		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);
+			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;
@@ -707,7 +686,7 @@ struct bt_ctf_field *bt_ctf_event_get_payload_field(struct bt_ctf_event *event)
 	}
 
 	payload = event->fields_payload;
-	bt_ctf_field_get(payload);
+	bt_get(payload);
 end:
 	return payload;
 }
@@ -734,16 +713,12 @@ int bt_ctf_event_set_payload_field(struct bt_ctf_event *event,
 		goto end;
 	}
 
-	bt_ctf_field_get(payload);
-	if (event->fields_payload) {
-		bt_ctf_field_put(event->fields_payload);
-	}
+	bt_get(payload);
+	bt_put(event->fields_payload);
 	event->fields_payload = payload;
 
 end:
-	if (payload_type) {
-		bt_ctf_field_type_put(payload_type);
-	}
+	bt_put(payload_type);
 	return ret;
 }
 
@@ -761,7 +736,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;
@@ -792,7 +767,7 @@ struct bt_ctf_field *bt_ctf_event_get_header(
 	}
 
 	header = event->event_header;
-	bt_ctf_field_get(header);
+	bt_get(header);
 end:
 	return header;
 }
@@ -802,35 +777,31 @@ int bt_ctf_event_set_header(struct bt_ctf_event *event,
 {
 	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;
 }
 
@@ -844,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;
 }
@@ -866,78 +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)
 {
-	bt_ctf_get(event);
+	bt_get(event);
 }
 
 void bt_ctf_event_put(struct bt_ctf_event *event)
 {
-	bt_ctf_put(event);
+	bt_put(event);
 }
 
 static
-void bt_ctf_event_class_destroy(struct bt_ref *ref)
+void bt_ctf_event_class_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_event_class *event_class;
-	struct bt_ctf_base *base;
-
-	if (!ref) {
-		return;
-	}
 
 	/*
 	 * Don't call put() on the stream class. See comment in
 	 * bt_ctf_event_class_set_stream_class for explanation.
 	 */
-	base = container_of(ref, struct bt_ctf_base, ref_count);
-	event_class = container_of(base, struct bt_ctf_event_class, base);
-	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);
-	}
+	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_ref *ref)
+void bt_ctf_event_destroy(struct bt_object *obj)
 {
 	struct bt_ctf_event *event;
-	struct bt_ctf_base *base;
 
-	if (!ref) {
-		return;
-	}
-
-	base = container_of(ref, struct bt_ctf_base, ref_count);
-	event = container_of(base, struct bt_ctf_event, base);
-	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);
 }
 
@@ -980,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;
 }
 
@@ -994,36 +944,6 @@ void bt_ctf_event_class_freeze(struct bt_ctf_event_class *event_class)
 	bt_ctf_attributes_freeze(event_class->attributes);
 }
 
-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_HIDDEN
 int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 		struct metadata_context *context)
@@ -1031,7 +951,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 	int i;
 	int count;
 	int ret = 0;
-	struct bt_object *attr_value = NULL;
+	struct bt_value *attr_value = NULL;
 
 	assert(event_class);
 	assert(context);
@@ -1059,12 +979,12 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			goto end;
 		}
 
-		switch (bt_object_get_type(attr_value)) {
-		case BT_OBJECT_TYPE_INTEGER:
+		switch (bt_value_get_type(attr_value)) {
+		case BT_VALUE_TYPE_INTEGER:
 		{
 			int64_t value;
 
-			ret = bt_object_integer_get(attr_value, &value);
+			ret = bt_value_integer_get(attr_value, &value);
 
 			if (ret) {
 				goto end;
@@ -1075,11 +995,11 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			break;
 		}
 
-		case BT_OBJECT_TYPE_STRING:
+		case BT_VALUE_TYPE_STRING:
 		{
 			const char *value;
 
-			ret = bt_object_string_get(attr_value, &value);
+			ret = bt_value_string_get(attr_value, &value);
 
 			if (ret) {
 				goto end;
@@ -1096,7 +1016,7 @@ int bt_ctf_event_class_serialize(struct bt_ctf_event_class *event_class,
 			break;
 		}
 
-		BT_OBJECT_PUT(attr_value);
+		BT_PUT(attr_value);
 	}
 
 	if (event_class->context) {
@@ -1121,7 +1041,7 @@ 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_OBJECT_PUT(attr_value);
+	BT_PUT(attr_value);
 	return ret;
 }
 
@@ -1219,13 +1139,13 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 		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);
+		bt_put(timestamp_field_type);
 		if (mapped_clock) {
-			uint64_t timestamp = bt_ctf_clock_get_time(
-				mapped_clock);
+			int64_t timestamp;
 
-			bt_ctf_clock_put(mapped_clock);
-			if (timestamp == (uint64_t) -1ULL) {
+			ret = bt_ctf_clock_get_time(mapped_clock, &timestamp);
+			bt_put(mapped_clock);
+			if (ret) {
 				goto end;
 			}
 
@@ -1237,34 +1157,8 @@ int bt_ctf_event_populate_event_header(struct bt_ctf_event *event)
 		}
 	}
 end:
-	if (id_field) {
-		bt_ctf_field_put(id_field);
-	}
-	if (timestamp_field) {
-		bt_ctf_field_put(timestamp_field);
-	}
-	return ret;
-}
-
-BT_HIDDEN
-int bt_ctf_event_set_stream(struct bt_ctf_event *event,
-		struct bt_ctf_stream *stream)
-{
-	int ret = 0;
-
-	if (!event) {
-		ret = -1;
-		goto end;
-	}
-
-	if (event->stream && stream) {
-		/* Already attached to a stream */
-		ret = -1;
-		goto end;
-	}
-
-	event->stream = stream;
-end:
+	bt_put(id_field);
+	bt_put(timestamp_field);
 	return ret;
 }
 
@@ -1281,10 +1175,8 @@ struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event)
 		goto error;
 	}
 
-	bt_ctf_base_init(copy, bt_ctf_event_destroy);
-	copy->event_class = event->event_class;
-	bt_ctf_event_class_get(copy->event_class);
-	copy->stream = event->stream;
+	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);
@@ -1314,24 +1206,6 @@ struct bt_ctf_event *bt_ctf_event_copy(struct bt_ctf_event *event)
 	return copy;
 
 error:
-	if (copy) {
-		if (copy->event_class) {
-			bt_ctf_event_class_put(copy->event_class);
-		}
-
-		if (copy->event_header) {
-			bt_ctf_field_put(copy->event_header);
-		}
-
-		if (copy->context_payload) {
-			bt_ctf_field_put(copy->context_payload);
-		}
-
-		if (copy->fields_payload) {
-			bt_ctf_field_put(copy->fields_payload);
-		}
-	}
-
-	g_free(copy);
-	return NULL;
+	BT_PUT(copy);
+	return copy;
 }