ctf: remove ctf_fs_ds_file::msg_iter field

[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 c826a656971a0831648e4d5292bf705158f8a014..ff9643b5af00043a83f2f552cbbbc74bc9146df9 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.h
+++ b/src/plugins/ctf/fs-src/data-stream-file.h
@@ -26,7 +26,7 @@
 #include <stdio.h>
 #include <stdbool.h>
 #include <glib.h>
-#include "common/babeltrace.h"
+#include "common/macros.h"
 #include <babeltrace2/babeltrace.h>
 
 #include "../common/msg-iter/msg-iter.h"
@@ -48,11 +48,16 @@ struct ctf_fs_ds_file_info {
 struct ctf_fs_metadata;
 
 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;
@@ -60,9 +65,6 @@ struct ctf_fs_ds_file {
        /* Owned by this */
        bt_stream *stream;
 
-       /* Weak */
-       struct bt_msg_iter *msg_iter;
-
        void *mmap_addr;
 
        /*
@@ -89,28 +91,31 @@ struct ctf_fs_ds_file {
 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,
-               bt_stream *stream, const char *path);
+               bt_self_message_iterator *self_msg_iter,
+               bt_stream *stream, const char *path,
+               bt_logging_level log_level);
 
 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(
-               struct ctf_fs_ds_file *ds_file,
+bt_component_class_message_iterator_next_method_status ctf_fs_ds_file_next(
+               struct ctf_msg_iter *msg_iter,
                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,
+               struct ctf_msg_iter *msg_iter);
 
 BT_HIDDEN
-struct ctf_fs_ds_index *ctf_fs_ds_index_create();
+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 */