src.ctf.fs: remove ctf_fs_ds_file::end_reached 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 af81915d829705ca3a43fbe8e4912822ac18b112..e42890b43a224cdb57701a1cfd02cd014cddf67a 100644 (file)
--- a/src/plugins/ctf/fs-src/data-stream-file.h
+++ b/src/plugins/ctf/fs-src/data-stream-file.h
@@ -54,10 +54,10 @@ struct ctf_fs_ds_file {
        bt_self_component *self_comp;
 
        /* Weak */
-       struct ctf_fs_metadata *metadata;
+       bt_self_message_iterator *self_msg_iter;
 
        /* Weak */
-       bt_self_message_iterator *pc_msg_iter;
+       struct ctf_fs_metadata *metadata;
 
        /* Owned by this */
        struct ctf_fs_file *file;
@@ -65,9 +65,6 @@ struct ctf_fs_ds_file {
        /* Owned by this */
        bt_stream *stream;
 
-       /* Weak */
-       struct bt_msg_iter *msg_iter;
-
        void *mmap_addr;
 
        /*
@@ -80,37 +77,30 @@ struct ctf_fs_ds_file {
        size_t mmap_len;
 
        /* Offset in the file where the current mapping starts. */
-       off_t mmap_offset;
+       off_t mmap_offset_in_file;
 
        /*
         * Offset, in the current mapping, of the address to return on the next
         * request.
         */
-       off_t request_offset;
-
-       bool end_reached;
+       off_t request_offset_in_mapping;
 };
 
 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_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_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_info *ds_file_info);
+               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(bt_logging_level log_level,
@@ -119,6 +109,6 @@ struct ctf_fs_ds_index *ctf_fs_ds_index_create(bt_logging_level log_level,
 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 */