X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.c;h=da242fd06a9631314b5adab3c35ed68ca63b7c40;hb=0f2d58c93fe05b0f40c1c9589aa59d4f9cad877b;hp=fa341ea1e02b6e8a10f32614240f62dbcd8a21c5;hpb=44c440bc5fe8219cc17d1b786d91fd83c4c9860a;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.c b/plugins/ctf/fs-src/fs.c
index fa341ea1..da242fd0 100644
--- a/plugins/ctf/fs-src/fs.c
+++ b/plugins/ctf/fs-src/fs.c
@@ -37,7 +37,7 @@
 #include "data-stream-file.h"
 #include "file.h"
 #include "../common/metadata/decoder.h"
-#include "../common/notif-iter/notif-iter.h"
+#include "../common/msg-iter/msg-iter.h"
 #include "../common/utils/utils.h"
 #include "query.h"
 
@@ -45,25 +45,25 @@
 #include "logging.h"
 
 static
-int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_iter_data)
+int msg_iter_data_set_current_ds_file(struct ctf_fs_msg_iter_data *msg_iter_data)
 {
 	struct ctf_fs_ds_file_info *ds_file_info;
 	int ret = 0;
 
-	BT_ASSERT(notif_iter_data->ds_file_info_index <
-		notif_iter_data->ds_file_group->ds_file_infos->len);
+	BT_ASSERT(msg_iter_data->ds_file_info_index <
+		msg_iter_data->ds_file_group->ds_file_infos->len);
 	ds_file_info = g_ptr_array_index(
-		notif_iter_data->ds_file_group->ds_file_infos,
-		notif_iter_data->ds_file_info_index);
-
-	ctf_fs_ds_file_destroy(notif_iter_data->ds_file);
-	notif_iter_data->ds_file = ctf_fs_ds_file_create(
-		notif_iter_data->ds_file_group->ctf_fs_trace,
-		notif_iter_data->pc_notif_iter,
-		notif_iter_data->notif_iter,
-		notif_iter_data->ds_file_group->stream,
+		msg_iter_data->ds_file_group->ds_file_infos,
+		msg_iter_data->ds_file_info_index);
+
+	ctf_fs_ds_file_destroy(msg_iter_data->ds_file);
+	msg_iter_data->ds_file = ctf_fs_ds_file_create(
+		msg_iter_data->ds_file_group->ctf_fs_trace,
+		msg_iter_data->pc_msg_iter,
+		msg_iter_data->msg_iter,
+		msg_iter_data->ds_file_group->stream,
 		ds_file_info->path->str);
-	if (!notif_iter_data->ds_file) {
+	if (!msg_iter_data->ds_file) {
 		ret = -1;
 	}
 
@@ -71,116 +71,121 @@ int notif_iter_data_set_current_ds_file(struct ctf_fs_notif_iter_data *notif_ite
 }
 
 static
-void ctf_fs_notif_iter_data_destroy(
-		struct ctf_fs_notif_iter_data *notif_iter_data)
+void ctf_fs_msg_iter_data_destroy(
+		struct ctf_fs_msg_iter_data *msg_iter_data)
 {
-	if (!notif_iter_data) {
+	if (!msg_iter_data) {
 		return;
 	}
 
-	ctf_fs_ds_file_destroy(notif_iter_data->ds_file);
+	ctf_fs_ds_file_destroy(msg_iter_data->ds_file);
 
-	if (notif_iter_data->notif_iter) {
-		bt_notif_iter_destroy(notif_iter_data->notif_iter);
+	if (msg_iter_data->msg_iter) {
+		bt_msg_iter_destroy(msg_iter_data->msg_iter);
 	}
 
-	g_free(notif_iter_data);
+	g_free(msg_iter_data);
 }
 
 static
-enum bt_notification_iterator_status ctf_fs_iterator_next_one(
-		struct ctf_fs_notif_iter_data *notif_iter_data,
-		struct bt_notification **notif)
+bt_self_message_iterator_status ctf_fs_iterator_next_one(
+		struct ctf_fs_msg_iter_data *msg_iter_data,
+		const bt_message **msg)
 {
-	enum bt_notification_iterator_status status;
+	bt_self_message_iterator_status status;
+	bt_message *priv_msg;
 	int ret;
 
-	BT_ASSERT(notif_iter_data->ds_file);
-	status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
+	BT_ASSERT(msg_iter_data->ds_file);
+	status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &priv_msg);
+	*msg = priv_msg;
 
-	if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK &&
-			bt_notification_get_type(*notif) ==
-			BT_NOTIFICATION_TYPE_STREAM_BEGIN) {
-		if (notif_iter_data->skip_stream_begin_notifs) {
+	if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK &&
+			bt_message_get_type(*msg) ==
+			BT_MESSAGE_TYPE_STREAM_BEGINNING) {
+		if (msg_iter_data->skip_stream_begin_msgs) {
 			/*
 			 * We already emitted a
-			 * BT_NOTIFICATION_TYPE_STREAM_BEGIN
-			 * notification: skip this one, get a new one.
+			 * BT_MESSAGE_TYPE_STREAM_BEGINNING
+			 * message: skip this one, get a new one.
 			 */
-			BT_PUT(*notif);
-			status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
-				notif);
-			BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
+			BT_MESSAGE_PUT_REF_AND_RESET(*msg);
+			status = ctf_fs_ds_file_next(msg_iter_data->ds_file,
+				&priv_msg);
+			*msg = priv_msg;
+			BT_ASSERT(status != BT_SELF_MESSAGE_ITERATOR_STATUS_END);
 			goto end;
 		} else {
 			/*
-			 * First BT_NOTIFICATION_TYPE_STREAM_BEGIN
-			 * notification: skip all following.
+			 * First BT_MESSAGE_TYPE_STREAM_BEGINNING
+			 * message: skip all following.
 			 */
-			notif_iter_data->skip_stream_begin_notifs = true;
+			msg_iter_data->skip_stream_begin_msgs = true;
 			goto end;
 		}
 	}
 
-	if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK &&
-			bt_notification_get_type(*notif) ==
-			BT_NOTIFICATION_TYPE_STREAM_END) {
-		notif_iter_data->ds_file_info_index++;
+	if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK &&
+			bt_message_get_type(*msg) ==
+			BT_MESSAGE_TYPE_STREAM_END) {
+		msg_iter_data->ds_file_info_index++;
 
-		if (notif_iter_data->ds_file_info_index ==
-				notif_iter_data->ds_file_group->ds_file_infos->len) {
+		if (msg_iter_data->ds_file_info_index ==
+				msg_iter_data->ds_file_group->ds_file_infos->len) {
 			/*
 			 * No more stream files to read: we reached the
 			 * real end. Emit this
-			 * BT_NOTIFICATION_TYPE_STREAM_END notification.
+			 * BT_MESSAGE_TYPE_STREAM_END message.
 			 * The next time ctf_fs_iterator_next() is
-			 * called for this notification iterator,
+			 * called for this message iterator,
 			 * ctf_fs_ds_file_next() will return
-			 * BT_NOTIFICATION_ITERATOR_STATUS_END().
+			 * BT_SELF_MESSAGE_ITERATOR_STATUS_END().
 			 */
 			goto end;
 		}
 
-		BT_PUT(*notif);
-		bt_notif_iter_reset(notif_iter_data->notif_iter);
+		BT_MESSAGE_PUT_REF_AND_RESET(*msg);
+		bt_msg_iter_reset(msg_iter_data->msg_iter);
 
 		/*
 		 * Open and start reading the next stream file within
 		 * our stream file group.
 		 */
-		ret = notif_iter_data_set_current_ds_file(notif_iter_data);
+		ret = msg_iter_data_set_current_ds_file(msg_iter_data);
 		if (ret) {
-			status = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+			status = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
 			goto end;
 		}
 
-		status = ctf_fs_ds_file_next(notif_iter_data->ds_file, notif);
+		status = ctf_fs_ds_file_next(msg_iter_data->ds_file, &priv_msg);
+		*msg = priv_msg;
 
 		/*
-		 * If we get a notification, we expect to get a
-		 * BT_NOTIFICATION_TYPE_STREAM_BEGIN notification
+		 * If we get a message, we expect to get a
+		 * BT_MESSAGE_TYPE_STREAM_BEGINNING message
 		 * because the iterator's state machine emits one before
 		 * even requesting the first block of data from the
-		 * medium. Skip this notification because we're not
+		 * medium. Skip this message because we're not
 		 * really starting a new stream here, and try getting a
-		 * new notification (which, if it works, is a
-		 * BT_NOTIFICATION_TYPE_PACKET_BEGIN one). We're sure to
+		 * new message (which, if it works, is a
+		 * BT_MESSAGE_TYPE_PACKET_BEGINNING one). We're sure to
 		 * get at least one pair of
-		 * BT_NOTIFICATION_TYPE_PACKET_BEGIN and
-		 * BT_NOTIFICATION_TYPE_PACKET_END notifications in the
+		 * BT_MESSAGE_TYPE_PACKET_BEGINNING and
+		 * BT_MESSAGE_TYPE_PACKET_END messages in the
 		 * case of a single, empty packet. We know there's at
 		 * least one packet because the stream file group does
 		 * not contain empty stream files.
 		 */
-		BT_ASSERT(notif_iter_data->skip_stream_begin_notifs);
-
-		if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
-			BT_ASSERT(bt_notification_get_type(*notif) ==
-				BT_NOTIFICATION_TYPE_STREAM_BEGIN);
-			BT_PUT(*notif);
-			status = ctf_fs_ds_file_next(notif_iter_data->ds_file,
-				notif);
-			BT_ASSERT(status != BT_NOTIFICATION_ITERATOR_STATUS_END);
+		BT_ASSERT(msg_iter_data->skip_stream_begin_msgs);
+
+		if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+			BT_ASSERT(bt_message_get_type(*msg) ==
+				BT_MESSAGE_TYPE_STREAM_BEGINNING);
+			BT_MESSAGE_PUT_REF_AND_RESET(*msg);
+			status = ctf_fs_ds_file_next(msg_iter_data->ds_file,
+				&priv_msg);
+			*msg = priv_msg;
+			BT_ASSERT(status != BT_SELF_MESSAGE_ITERATOR_STATUS_END);
 		}
 	}
 
@@ -189,20 +194,20 @@ end:
 }
 
 BT_HIDDEN
-enum bt_notification_iterator_status ctf_fs_iterator_next(
-		struct bt_private_connection_private_notification_iterator *iterator,
-		bt_notification_array notifs, uint64_t capacity,
+bt_self_message_iterator_status ctf_fs_iterator_next(
+		bt_self_message_iterator *iterator,
+		bt_message_array_const msgs, uint64_t capacity,
 		uint64_t *count)
 {
-	enum bt_notification_iterator_status status =
-		BT_NOTIFICATION_ITERATOR_STATUS_OK;
-	struct ctf_fs_notif_iter_data *notif_iter_data =
-		bt_private_connection_private_notification_iterator_get_user_data(iterator);
+	bt_self_message_iterator_status status =
+		BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
+	struct ctf_fs_msg_iter_data *msg_iter_data =
+		bt_self_message_iterator_get_data(iterator);
 	uint64_t i = 0;
 
-	while (i < capacity && status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
-		status = ctf_fs_iterator_next_one(notif_iter_data, &notifs[i]);
-		if (status == BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+	while (i < capacity && status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
+		status = ctf_fs_iterator_next_one(msg_iter_data, &msgs[i]);
+		if (status == BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
 			i++;
 		}
 	}
@@ -210,83 +215,81 @@ enum bt_notification_iterator_status ctf_fs_iterator_next(
 	if (i > 0) {
 		/*
 		 * Even if ctf_fs_iterator_next_one() returned something
-		 * else than BT_NOTIFICATION_ITERATOR_STATUS_OK, we
-		 * accumulated notification objects in the output
-		 * notification array, so we need to return
-		 * BT_NOTIFICATION_ITERATOR_STATUS_OK so that they are
+		 * else than BT_SELF_MESSAGE_ITERATOR_STATUS_OK, we
+		 * accumulated message objects in the output
+		 * message array, so we need to return
+		 * BT_SELF_MESSAGE_ITERATOR_STATUS_OK so that they are
 		 * transfered to downstream. This other status occurs
-		 * again the next time muxer_notif_iter_do_next() is
+		 * again the next time muxer_msg_iter_do_next() is
 		 * called, possibly without any accumulated
-		 * notification, in which case we'll return it.
+		 * message, in which case we'll return it.
 		 */
 		*count = i;
-		status = BT_NOTIFICATION_ITERATOR_STATUS_OK;
+		status = BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
 	}
 
 	return status;
 }
 
-void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it)
+void ctf_fs_iterator_finalize(bt_self_message_iterator *it)
 {
-	void *notif_iter_data =
-		bt_private_connection_private_notification_iterator_get_user_data(it);
-
-	ctf_fs_notif_iter_data_destroy(notif_iter_data);
+	ctf_fs_msg_iter_data_destroy(
+		bt_self_message_iterator_get_data(it));
 }
 
-enum bt_notification_iterator_status ctf_fs_iterator_init(
-		struct bt_private_connection_private_notification_iterator *it,
-		struct bt_private_port *port)
+bt_self_message_iterator_status ctf_fs_iterator_init(
+		bt_self_message_iterator *self_msg_iter,
+		bt_self_component_source *self_comp,
+		bt_self_component_port_output *self_port)
 {
 	struct ctf_fs_port_data *port_data;
-	struct ctf_fs_notif_iter_data *notif_iter_data = NULL;
-	enum bt_notification_iterator_status ret =
-		BT_NOTIFICATION_ITERATOR_STATUS_OK;
+	struct ctf_fs_msg_iter_data *msg_iter_data = NULL;
+	bt_self_message_iterator_status ret =
+		BT_SELF_MESSAGE_ITERATOR_STATUS_OK;
 	int iret;
 
-	port_data = bt_private_port_get_user_data(port);
-	if (!port_data) {
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_INVALID;
+	port_data = bt_self_component_port_get_data(
+		bt_self_component_port_output_as_self_component_port(
+			self_port));
+	BT_ASSERT(port_data);
+	msg_iter_data = g_new0(struct ctf_fs_msg_iter_data, 1);
+	if (!msg_iter_data) {
+		ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
 		goto error;
 	}
 
-	notif_iter_data = g_new0(struct ctf_fs_notif_iter_data, 1);
-	if (!notif_iter_data) {
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
-		goto error;
-	}
-
-	notif_iter_data->pc_notif_iter = it;
-	notif_iter_data->notif_iter = bt_notif_iter_create(
+	msg_iter_data->pc_msg_iter = self_msg_iter;
+	msg_iter_data->msg_iter = bt_msg_iter_create(
 		port_data->ds_file_group->ctf_fs_trace->metadata->tc,
 		bt_common_get_page_size() * 8,
 		ctf_fs_ds_file_medops, NULL);
-	if (!notif_iter_data->notif_iter) {
-		BT_LOGE_STR("Cannot create a CTF notification iterator.");
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_NOMEM;
+	if (!msg_iter_data->msg_iter) {
+		BT_LOGE_STR("Cannot create a CTF message iterator.");
+		ret = BT_SELF_MESSAGE_ITERATOR_STATUS_NOMEM;
 		goto error;
 	}
 
-	notif_iter_data->ds_file_group = port_data->ds_file_group;
-	iret = notif_iter_data_set_current_ds_file(notif_iter_data);
+	msg_iter_data->ds_file_group = port_data->ds_file_group;
+	iret = msg_iter_data_set_current_ds_file(msg_iter_data);
 	if (iret) {
-		ret = BT_NOTIFICATION_ITERATOR_STATUS_ERROR;
+		ret = BT_SELF_MESSAGE_ITERATOR_STATUS_ERROR;
 		goto error;
 	}
 
-	ret = bt_private_connection_private_notification_iterator_set_user_data(it, notif_iter_data);
-	if (ret != BT_NOTIFICATION_ITERATOR_STATUS_OK) {
+	bt_self_message_iterator_set_data(self_msg_iter,
+		msg_iter_data);
+	if (ret != BT_SELF_MESSAGE_ITERATOR_STATUS_OK) {
 		goto error;
 	}
 
-	notif_iter_data = NULL;
+	msg_iter_data = NULL;
 	goto end;
 
 error:
-	(void) bt_private_connection_private_notification_iterator_set_user_data(it, NULL);
+	bt_self_message_iterator_set_data(self_msg_iter, NULL);
 
 end:
-	ctf_fs_notif_iter_data_destroy(notif_iter_data);
+	ctf_fs_msg_iter_data_destroy(msg_iter_data);
 	return ret;
 }
 
@@ -319,6 +322,8 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
 		g_ptr_array_free(ctf_fs_trace->ds_file_groups, TRUE);
 	}
 
+	BT_TRACE_PUT_REF_AND_RESET(ctf_fs_trace->trace);
+
 	if (ctf_fs_trace->path) {
 		g_string_free(ctf_fs_trace->path, TRUE);
 	}
@@ -336,17 +341,16 @@ void ctf_fs_trace_destroy(struct ctf_fs_trace *ctf_fs_trace)
 }
 
 static
-void ctf_fs_trace_destroy_notifier(void *data)
+void ctf_fs_trace_destroy_msgier(void *data)
 {
 	struct ctf_fs_trace *trace = data;
 	ctf_fs_trace_destroy(trace);
 }
 
-void ctf_fs_finalize(struct bt_private_component *component)
+void ctf_fs_finalize(bt_self_component_source *component)
 {
-	void *data = bt_private_component_get_user_data(component);
-
-	ctf_fs_destroy(data);
+	ctf_fs_destroy(bt_self_component_get_data(
+		bt_self_component_source_as_self_component(component)));
 }
 
 static
@@ -409,8 +413,8 @@ int create_one_port_for_trace(struct ctf_fs_component *ctf_fs,
 
 	port_data->ctf_fs = ctf_fs;
 	port_data->ds_file_group = ds_file_group;
-	ret = bt_private_component_source_add_output_private_port(
-		ctf_fs->priv_comp, port_name->str, port_data, NULL);
+	ret = bt_self_component_source_add_output_port(
+		ctf_fs->self_comp, port_name->str, port_data, NULL);
 	if (ret) {
 		goto error;
 	}
@@ -508,15 +512,15 @@ void ctf_fs_ds_file_group_destroy(struct ctf_fs_ds_file_group *ds_file_group)
 		g_ptr_array_free(ds_file_group->ds_file_infos, TRUE);
 	}
 
-	bt_put(ds_file_group->stream);
-	bt_put(ds_file_group->stream_class);
+	bt_stream_put_ref(ds_file_group->stream);
+	bt_stream_class_put_ref(ds_file_group->stream_class);
 	g_free(ds_file_group);
 }
 
 static
 struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
 		struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_stream_class *stream_class,
+		bt_stream_class *stream_class,
 		uint64_t stream_instance_id)
 {
 	struct ctf_fs_ds_file_group *ds_file_group;
@@ -534,7 +538,8 @@ struct ctf_fs_ds_file_group *ctf_fs_ds_file_group_create(
 
 	ds_file_group->stream_id = stream_instance_id;
 	BT_ASSERT(stream_class);
-	ds_file_group->stream_class = bt_get(stream_class);
+	ds_file_group->stream_class = stream_class;
+	bt_stream_class_get_ref(ds_file_group->stream_class);
 	ds_file_group->ctf_fs_trace = ctf_fs_trace;
 	goto end;
 
@@ -607,9 +612,9 @@ end:
 
 static
 int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_graph *graph, const char *path)
+		const char *path)
 {
-	struct bt_stream_class *stream_class = NULL;
+	bt_stream_class *stream_class = NULL;
 	int64_t stream_instance_id = -1;
 	int64_t begin_ns = -1;
 	struct ctf_fs_ds_file_group *ds_file_group = NULL;
@@ -618,33 +623,30 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 	size_t i;
 	struct ctf_fs_ds_file *ds_file = NULL;
 	struct ctf_fs_ds_index *index = NULL;
-	struct bt_notif_iter *notif_iter = NULL;
+	struct bt_msg_iter *msg_iter = NULL;
 	struct ctf_stream_class *sc = NULL;
-	struct bt_notif_iter_packet_properties props;
+	struct bt_msg_iter_packet_properties props;
 
-	notif_iter = bt_notif_iter_create(ctf_fs_trace->metadata->tc,
+	msg_iter = bt_msg_iter_create(ctf_fs_trace->metadata->tc,
 		bt_common_get_page_size() * 8, ctf_fs_ds_file_medops, NULL);
-	if (!notif_iter) {
-		BT_LOGE_STR("Cannot create a CTF notification iterator.");
+	if (!msg_iter) {
+		BT_LOGE_STR("Cannot create a CTF message iterator.");
 		goto error;
 	}
 
-	ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, notif_iter,
+	ds_file = ctf_fs_ds_file_create(ctf_fs_trace, NULL, msg_iter,
 		NULL, path);
 	if (!ds_file) {
 		goto error;
 	}
 
-	ret = ctf_fs_ds_file_borrow_packet_header_context_fields(ds_file,
-		NULL, NULL);
+	ret = bt_msg_iter_get_packet_properties(ds_file->msg_iter, &props);
 	if (ret) {
 		BT_LOGE("Cannot get stream file's first packet's header and context fields (`%s`).",
 			path);
 		goto error;
 	}
 
-	ret = bt_notif_iter_get_packet_properties(ds_file->notif_iter, &props);
-	BT_ASSERT(ret == 0);
 	sc = ctf_trace_class_borrow_stream_class_by_id(ds_file->metadata->tc,
 		props.stream_class_id);
 	BT_ASSERT(sc);
@@ -654,9 +656,11 @@ int add_ds_file_to_ds_file_group(struct ctf_fs_trace *ctf_fs_trace,
 
 	if (props.snapshots.beginning_clock != UINT64_C(-1)) {
 		BT_ASSERT(sc->default_clock_class);
-		ret = bt_clock_class_cycles_to_ns_from_origin(
-			sc->default_clock_class,
-			props.snapshots.beginning_clock, &begin_ns);
+		ret = bt_util_clock_cycles_to_ns_from_origin(
+			props.snapshots.beginning_clock,
+			sc->default_clock_class->frequency,
+			sc->default_clock_class->offset_seconds,
+			sc->default_clock_class->offset_cycles, &begin_ns);
 		if (ret) {
 			BT_LOGE("Cannot convert clock cycles to nanoseconds from origin (`%s`).",
 				path);
@@ -752,8 +756,8 @@ end:
 
 	ctf_fs_ds_file_destroy(ds_file);
 
-	if (notif_iter) {
-		bt_notif_iter_destroy(notif_iter);
+	if (msg_iter) {
+		bt_msg_iter_destroy(msg_iter);
 	}
 
 	ctf_fs_ds_index_destroy(index);
@@ -761,8 +765,7 @@ end:
 }
 
 static
-int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
-		struct bt_graph *graph)
+int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace)
 {
 	int ret = 0;
 	const char *basename;
@@ -827,7 +830,7 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
 			continue;
 		}
 
-		ret = add_ds_file_to_ds_file_group(ctf_fs_trace, graph,
+		ret = add_ds_file_to_ds_file_group(ctf_fs_trace,
 			file->path->str);
 		if (ret) {
 			BT_LOGE("Cannot add stream file `%s` to stream file group",
@@ -839,6 +842,10 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
 		ctf_fs_file_destroy(file);
 	}
 
+	if (!ctf_fs_trace->trace) {
+		goto end;
+	}
+
 	/*
 	 * At this point, DS file groupes are created, but their
 	 * associated stream objects do not exist yet. This is because
@@ -859,12 +866,14 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
 			/* No stream ID: use 0 */
 			ds_file_group->stream = bt_stream_create_with_id(
 				ds_file_group->stream_class,
+				ctf_fs_trace->trace,
 				ctf_fs_trace->next_stream_id);
 			ctf_fs_trace->next_stream_id++;
 		} else {
 			/* Specific stream ID */
 			ds_file_group->stream = bt_stream_create_with_id(
 				ds_file_group->stream_class,
+				ctf_fs_trace->trace,
 				(uint64_t) ds_file_group->stream_id);
 		}
 
@@ -876,7 +885,8 @@ int create_ds_file_groups(struct ctf_fs_trace *ctf_fs_trace,
 			goto error;
 		}
 
-		ret = bt_stream_set_name(ds_file_group->stream, name->str);
+		ret = bt_stream_set_name(ds_file_group->stream,
+			name->str);
 		if (ret) {
 			BT_LOGE("Cannot set stream's name: "
 				"addr=%p, stream-name=\"%s\"",
@@ -906,10 +916,58 @@ end:
 	return ret;
 }
 
+static
+int set_trace_name(bt_trace *trace, const char *name_suffix)
+{
+	int ret = 0;
+	const bt_trace_class *tc = bt_trace_borrow_class_const(trace);
+	const bt_value *val;
+	GString *name;
+
+	name = g_string_new(NULL);
+	if (!name) {
+		BT_LOGE_STR("Failed to allocate a GString.");
+		ret = -1;
+		goto end;
+	}
+
+	/*
+	 * Check if we have a trace environment string value named `hostname`.
+	 * If so, use it as the trace name's prefix.
+	 */
+	val = bt_trace_class_borrow_environment_entry_value_by_name_const(
+		tc, "hostname");
+	if (val && bt_value_is_string(val)) {
+		g_string_append(name, bt_value_string_get(val));
+
+		if (name_suffix) {
+			g_string_append_c(name, G_DIR_SEPARATOR);
+		}
+	}
+
+	if (name_suffix) {
+		g_string_append(name, name_suffix);
+	}
+
+	ret = bt_trace_set_name(trace, name->str);
+	if (ret) {
+		goto end;
+	}
+
+	goto end;
+
+end:
+	if (name) {
+		g_string_free(name, TRUE);
+	}
+
+	return ret;
+}
+
 BT_HIDDEN
-struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
-		struct ctf_fs_metadata_config *metadata_config,
-		struct bt_graph *graph)
+struct ctf_fs_trace *ctf_fs_trace_create(bt_self_component_source *self_comp,
+		const char *path, const char *name,
+		struct ctf_fs_metadata_config *metadata_config)
 {
 	struct ctf_fs_trace *ctf_fs_trace;
 	int ret;
@@ -941,12 +999,28 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
 		goto error;
 	}
 
-	ret = ctf_fs_metadata_set_trace(ctf_fs_trace, metadata_config);
+	ret = ctf_fs_metadata_set_trace_class(self_comp,
+		ctf_fs_trace, metadata_config);
 	if (ret) {
 		goto error;
 	}
 
-	ret = create_ds_file_groups(ctf_fs_trace, graph);
+	if (ctf_fs_trace->metadata->trace_class) {
+		ctf_fs_trace->trace =
+			bt_trace_create(ctf_fs_trace->metadata->trace_class);
+		if (!ctf_fs_trace->trace) {
+			goto error;
+		}
+	}
+
+	if (ctf_fs_trace->trace) {
+		ret = set_trace_name(ctf_fs_trace->trace, name);
+		if (ret) {
+			goto error;
+		}
+	}
+
+	ret = create_ds_file_groups(ctf_fs_trace);
 	if (ret) {
 		goto error;
 	}
@@ -956,7 +1030,9 @@ struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
 	 * trace needs. There won't be any more. Therefore it is safe to
 	 * make this trace static.
 	 */
-	(void) bt_trace_make_static(ctf_fs_trace->metadata->trace);
+	if (ctf_fs_trace->trace) {
+		(void) bt_trace_make_static(ctf_fs_trace->trace);
+	}
 
 	goto end;
 
@@ -1148,7 +1224,8 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path) {
 }
 
 static
-int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
+int create_ctf_fs_traces(bt_self_component_source *self_comp,
+		struct ctf_fs_component *ctf_fs,
 		const char *path_param)
 {
 	struct ctf_fs_trace *ctf_fs_trace = NULL;
@@ -1188,13 +1265,10 @@ int create_ctf_fs_traces(struct ctf_fs_component *ctf_fs,
 			tn_node = g_list_next(tn_node)) {
 		GString *trace_path = tp_node->data;
 		GString *trace_name = tn_node->data;
-		struct bt_graph *graph = bt_component_borrow_graph(
-			bt_component_borrow_from_private(ctf_fs->priv_comp));
 
-		BT_ASSERT(graph);
-		ctf_fs_trace = ctf_fs_trace_create(trace_path->str,
-				trace_name->str, &ctf_fs->metadata_config,
-				graph);
+		ctf_fs_trace = ctf_fs_trace_create(self_comp,
+				trace_path->str, trace_name->str,
+				&ctf_fs->metadata_config);
 		if (!ctf_fs_trace) {
 			BT_LOGE("Cannot create trace for `%s`.",
 				trace_path->str);
@@ -1245,56 +1319,53 @@ end:
 }
 
 static
-struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
-		struct bt_value *params)
+struct ctf_fs_component *ctf_fs_create(
+		bt_self_component_source *self_comp,
+		const bt_value *params)
 {
 	struct ctf_fs_component *ctf_fs;
-	struct bt_value *value = NULL;
+	const bt_value *value = NULL;
 	const char *path_param;
-	enum bt_component_status ret;
-	enum bt_value_status value_ret;
 
 	ctf_fs = g_new0(struct ctf_fs_component, 1);
 	if (!ctf_fs) {
 		goto end;
 	}
 
-	ret = bt_private_component_set_user_data(priv_comp, ctf_fs);
-	BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
+	bt_self_component_set_data(
+		bt_self_component_source_as_self_component(self_comp),
+		ctf_fs);
 
 	/*
 	 * We don't need to get a new reference here because as long as
 	 * our private ctf_fs_component object exists, the containing
 	 * private component should also exist.
 	 */
-	ctf_fs->priv_comp = priv_comp;
-	value = bt_value_map_borrow(params, "path");
+	ctf_fs->self_comp = self_comp;
+	value = bt_value_map_borrow_entry_value_const(params, "path");
 	if (value && !bt_value_is_string(value)) {
 		goto error;
 	}
 
-	value_ret = bt_value_string_get(value, &path_param);
-	BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
-	value = bt_value_map_borrow(params, "clock-class-offset-s");
+	path_param = bt_value_string_get(value);
+	value = bt_value_map_borrow_entry_value_const(params,
+		"clock-class-offset-s");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-s should be an integer");
 			goto error;
 		}
-		value_ret = bt_value_integer_get(value,
-			&ctf_fs->metadata_config.clock_class_offset_s);
-		BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+		ctf_fs->metadata_config.clock_class_offset_s = bt_value_integer_get(value);
 	}
 
-	value = bt_value_map_borrow(params, "clock-class-offset-ns");
+	value = bt_value_map_borrow_entry_value_const(params,
+		"clock-class-offset-ns");
 	if (value) {
 		if (!bt_value_is_integer(value)) {
 			BT_LOGE("clock-class-offset-ns should be an integer");
 			goto error;
 		}
-		value_ret = bt_value_integer_get(value,
-			&ctf_fs->metadata_config.clock_class_offset_ns);
-		BT_ASSERT(value_ret == BT_VALUE_STATUS_OK);
+		ctf_fs->metadata_config.clock_class_offset_ns = bt_value_integer_get(value);
 	}
 
 	ctf_fs->port_data = g_ptr_array_new_with_free_func(port_data_destroy);
@@ -1303,12 +1374,12 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
 	}
 
 	ctf_fs->traces = g_ptr_array_new_with_free_func(
-			ctf_fs_trace_destroy_notifier);
+			ctf_fs_trace_destroy_msgier);
 	if (!ctf_fs->traces) {
 		goto error;
 	}
 
-	if (create_ctf_fs_traces(ctf_fs, path_param)) {
+	if (create_ctf_fs_traces(self_comp, ctf_fs, path_param)) {
 		goto error;
 	}
 
@@ -1317,48 +1388,48 @@ struct ctf_fs_component *ctf_fs_create(struct bt_private_component *priv_comp,
 error:
 	ctf_fs_destroy(ctf_fs);
 	ctf_fs = NULL;
-	ret = bt_private_component_set_user_data(priv_comp, NULL);
-	BT_ASSERT(ret == BT_COMPONENT_STATUS_OK);
+	bt_self_component_set_data(
+		bt_self_component_source_as_self_component(self_comp),
+		NULL);
 
 end:
 	return ctf_fs;
 }
 
 BT_HIDDEN
-enum bt_component_status ctf_fs_init(struct bt_private_component *priv_comp,
-		struct bt_value *params, UNUSED_VAR void *init_method_data)
+bt_self_component_status ctf_fs_init(
+		bt_self_component_source *self_comp,
+		const bt_value *params, UNUSED_VAR void *init_method_data)
 {
 	struct ctf_fs_component *ctf_fs;
-	enum bt_component_status ret = BT_COMPONENT_STATUS_OK;
+	bt_self_component_status ret = BT_SELF_COMPONENT_STATUS_OK;
 
-	ctf_fs = ctf_fs_create(priv_comp, params);
+	ctf_fs = ctf_fs_create(self_comp, params);
 	if (!ctf_fs) {
-		ret = BT_COMPONENT_STATUS_ERROR;
+		ret = BT_SELF_COMPONENT_STATUS_ERROR;
 	}
 
 	return ret;
 }
 
 BT_HIDDEN
-struct bt_component_class_query_method_return ctf_fs_query(
-		struct bt_component_class *comp_class,
-		struct bt_query_executor *query_exec,
-		const char *object, struct bt_value *params)
+bt_query_status ctf_fs_query(
+		bt_self_component_class_source *comp_class,
+		const bt_query_executor *query_exec,
+		const char *object, const bt_value *params,
+		const bt_value **result)
 {
-	struct bt_component_class_query_method_return ret = {
-		.result = NULL,
-		.status = BT_QUERY_STATUS_OK,
-	};
+	bt_query_status status = BT_QUERY_STATUS_OK;
 
 	if (!strcmp(object, "metadata-info")) {
-		ret = metadata_info_query(comp_class, params);
+		status = metadata_info_query(comp_class, params, result);
 	} else if (!strcmp(object, "trace-info")) {
-		ret = trace_info_query(comp_class, params);
+		status = trace_info_query(comp_class, params, result);
 	} else {
 		BT_LOGE("Unknown query object `%s`", object);
-		ret.status = BT_QUERY_STATUS_INVALID_OBJECT;
+		status = BT_QUERY_STATUS_INVALID_OBJECT;
 		goto end;
 	}
 end:
-	return ret;
+	return status;
 }