allow multiple ctf streams to be open

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

diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h
index ff97b7a252315b9fa29e2aacdf861ac7fa816ff3..151e28eda5d5c2d8f8f801e9ff5523e8a1509e91 100644 (file)
--- a/plugins/ctf/fs/fs.h
+++ b/plugins/ctf/fs/fs.h
@@ -1,5 +1,5 @@
-#ifndef BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H
-#define BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H
+#ifndef BABELTRACE_PLUGIN_CTF_FS_H
+#define BABELTRACE_PLUGIN_CTF_FS_H
 
 /*
  * BabelTrace - CTF on File System Component
@@ -37,6 +37,8 @@
 
 static bool ctf_fs_debug;
 
+struct bt_notification_heap;
+
 struct ctf_fs_file {
        struct ctf_fs_component *ctf_fs;
        GString *path;
@@ -55,19 +57,17 @@ struct ctf_fs_metadata {
 struct ctf_fs_stream {
        struct ctf_fs_file *file;
        struct bt_ctf_stream *stream;
+       /* FIXME There should be many and ctf_fs_stream should not own them. */
        struct bt_ctf_notif_iter *notif_iter;
        void *mmap_addr;
        size_t mmap_len;
        off_t mmap_offset;
        off_t request_offset;
-};
-
-struct ctf_fs_data_stream {
-       GPtrArray *streams;
+       bool end_reached;
 };
 
 struct ctf_fs_iterator {
-       int dummy;
+       struct bt_notification_heap *pending_notifications;
 };
 
 struct ctf_fs_component_options {
@@ -78,13 +78,14 @@ 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;
+       GPtrArray *streams; /* struct ctf_fs_data_stream * */
 };
 
 BT_HIDDEN
 enum bt_component_status ctf_fs_init(struct bt_component *source,
                struct bt_value *params);
 
-#endif /* BABELTRACE_PLUGIN_CTF_FS_INTERNAL_H */
+#endif /* BABELTRACE_PLUGIN_CTF_FS_H */