ctf: rename bt_msg_iter to ctf_msg_iter

[babeltrace.git] / src / plugins / ctf / fs-src / data-stream-file.h

diff --git a/src/plugins/ctf/fs-src/data-stream-file.h b/src/plugins/ctf/fs-src/data-stream-file.h
index 64b5b50bfc542d8fed8ad9d2cfa71dce7c69b145..57c7eea302e60107059f4c54c02b96b3fc970e1b 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.h
+++ b/src/plugins/ctf/fs-src/data-stream-file.h
@@ -51,10 +51,13 @@ struct ctf_fs_ds_file {
        bt_logging_level log_level;
 
        /* Weak */
-       struct ctf_fs_metadata *metadata;
+       bt_self_component *self_comp;
 
        /* Weak */
-       bt_self_message_iterator *pc_msg_iter;
+       bt_self_message_iterator *self_msg_iter;
+
+       /* Weak */
+       struct ctf_fs_metadata *metadata;
 
        /* Owned by this */
        struct ctf_fs_file *file;
@@ -63,7 +66,7 @@ struct ctf_fs_ds_file {
        bt_stream *stream;
 
        /* Weak */
-       struct bt_msg_iter *msg_iter;
+       struct ctf_msg_iter *msg_iter;
 
        void *mmap_addr;
 
@@ -92,7 +95,7 @@ BT_HIDDEN
 struct ctf_fs_ds_file *ctf_fs_ds_file_create(
                struct ctf_fs_trace *ctf_fs_trace,
                bt_self_message_iterator *pc_msg_iter,
-               struct bt_msg_iter *msg_iter,
+               struct ctf_msg_iter *msg_iter,
                bt_stream *stream, const char *path,
                bt_logging_level log_level);
 
@@ -100,20 +103,22 @@ BT_HIDDEN
 void ctf_fs_ds_file_destroy(struct ctf_fs_ds_file *stream);
 
 BT_HIDDEN
-bt_self_message_iterator_status ctf_fs_ds_file_next(
+bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
                struct ctf_fs_ds_file *ds_file,
                bt_message **msg);
 
 BT_HIDDEN
 struct ctf_fs_ds_index *ctf_fs_ds_file_build_index(
-               struct ctf_fs_ds_file *ds_file);
+               struct ctf_fs_ds_file *ds_file,
+               struct ctf_fs_ds_file_info *ds_file_info);
 
 BT_HIDDEN
-struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level);
+struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level,
+               bt_self_component *self_comp);
 
 BT_HIDDEN
 void ctf_fs_ds_index_destroy(struct ctf_fs_ds_index *index);
 
-extern struct bt_msg_iter_medium_ops ctf_fs_ds_file_medops;
+extern struct ctf_msg_iter_medium_ops ctf_fs_ds_file_medops;
 
 #endif /* CTF_FS_DS_FILE_H */