Merge streams in ctf fs component

[babeltrace.git] / plugins / ctf / fs / fs.h

diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h
index f4bd86c9d9b515065be5bf2d6a0e447a7e4801fa..30665a33bce881f008cf1a886d295abdd4ae5507 100644 (file)
--- a/plugins/ctf/fs/fs.h
+++ b/plugins/ctf/fs/fs.h
@@ -60,18 +60,34 @@ struct ctf_fs_stream {
        /* FIXME There should be many and ctf_fs_stream should not own them. */
        struct bt_ctf_notif_iter *notif_iter;
        void *mmap_addr;
+       /* Max length of chunk to mmap() when updating the current mapping. */
+       size_t mmap_max_len;
+       /* Length of the current mapping. */
        size_t mmap_len;
+       /* Length of the current mapping which *exists* in the backing file. */
+       size_t mmap_valid_len;
+       /* Offset in the file where the current mapping starts. */
        off_t mmap_offset;
+       /*
+        * Offset, in the current mapping, of the address to return on the next
+        * request.
+        */
        off_t request_offset;
        bool end_reached;
 };
 
-struct ctf_fs_data_stream {
-       GPtrArray *streams;
-};
-
 struct ctf_fs_iterator {
        struct bt_notification_heap *pending_notifications;
+       struct bt_notification *current_notification;
+       /*
+        * struct ctf_fs_data_stream* which have not yet been associated to a
+        * bt_ctf_stream. The association is performed on the first packet
+        * read by the stream (since, at that point, we have read a packet
+        * header).
+        */
+       GPtrArray *pending_streams;
+       /* bt_ctf_stream -> ctf_fs_stream */
+       GHashTable *stream_ht;
 };
 
 struct ctf_fs_component_options {
@@ -82,10 +98,8 @@ struct ctf_fs_component {
        GString *trace_path;
        FILE *error_fp;
        size_t page_size;
-       struct bt_notification *current_notification;
-       struct ctf_fs_metadata metadata;
-       struct ctf_fs_data_stream data_stream;
        struct ctf_fs_component_options options;
+       struct ctf_fs_metadata *metadata;
 };
 
 BT_HIDDEN