X-Git-Url: https://git.efficios.com/?a=blobdiff_plain;f=src%2Fplugins%2Fctf%2Ffs-src%2Ffs.h;h=95fffa249fa274e4afec2e70871f604173219995;hb=5d452e1fef736bf4e80bc48d9d60c08c949ced36;hp=10a17ba8e08a6552135c719f1ea26ba9e1a47929;hpb=c77d62f1106b5d2e7699d55fc953edb81b7f1ed9;p=babeltrace.git

diff --git a/src/plugins/ctf/fs-src/fs.h b/src/plugins/ctf/fs-src/fs.h
index 10a17ba8..95fffa24 100644
--- a/src/plugins/ctf/fs-src/fs.h
+++ b/src/plugins/ctf/fs-src/fs.h
@@ -84,8 +84,13 @@ struct ctf_fs_component {
 struct ctf_fs_trace {
 	bt_logging_level log_level;
 
-	/* Weak */
+	/*
+	 * Weak. These are mostly used to generate log messages or to append
+	 * error causes. They are mutually exclusive, only one of them must be
+	 * set.
+	 */
 	bt_self_component *self_comp;
+	bt_self_component_class *self_comp_class;
 
 	/* Owned by this */
 	struct ctf_fs_metadata *metadata;
@@ -127,7 +132,7 @@ struct ctf_fs_ds_index_entry {
 };
 
 struct ctf_fs_ds_index {
-	/* Array of pointer to struct ctf_fs_fd_index_entry. */
+	/* Array of pointer to struct ctf_fs_ds_index_entry. */
 	GPtrArray *entries;
 };
 
@@ -156,12 +161,7 @@ struct ctf_fs_ds_file_group {
 	struct ctf_fs_trace *ctf_fs_trace;
 
 	/*
-	 * Owned by this. May be NULL.
-	 *
-	 * A stream cannot be assumed to be indexed as the indexing might have
-	 * been skipped. Moreover, the index's fields may not all be available
-	 * depending on the producer (e.g. timestamp_begin/end are not
-	 * mandatory).
+	 * Owned by this.
 	 */
 	struct ctf_fs_ds_index *index;
 };
@@ -181,7 +181,7 @@ struct ctf_fs_msg_iter_data {
 	bt_self_component *self_comp;
 
 	/* Weak */
-	bt_self_message_iterator *pc_msg_iter;
+	bt_self_message_iterator *self_msg_iter;
 
 	/* Weak, belongs to ctf_fs_trace */
 	struct ctf_fs_ds_file_group *ds_file_group;
@@ -193,12 +193,13 @@ struct ctf_fs_msg_iter_data {
 	size_t ds_file_info_index;
 
 	/* Owned by this */
-	struct bt_msg_iter *msg_iter;
+	struct ctf_msg_iter *msg_iter;
 };
 
 BT_HIDDEN
-bt_component_class_init_method_status ctf_fs_init(
+bt_component_class_initialize_method_status ctf_fs_init(
 		bt_self_component_source *source,
+		bt_self_component_source_configuration *config,
 		const bt_value *params, void *init_method_data);
 
 BT_HIDDEN
@@ -212,8 +213,9 @@ bt_component_class_query_method_status ctf_fs_query(
 		void *method_data, const bt_value **result);
 
 BT_HIDDEN
-bt_component_class_message_iterator_init_method_status ctf_fs_iterator_init(
+bt_component_class_message_iterator_initialize_method_status ctf_fs_iterator_init(
 		bt_self_message_iterator *self_msg_iter,
+		bt_self_message_iterator_configuration *config,
 		bt_self_component_source *self_comp,
 		bt_self_component_port_output *self_port);