Update notification iterator's "init" function signature

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

diff --git a/plugins/ctf/fs/fs.h b/plugins/ctf/fs/fs.h
index b3bd3544245e74a2bb1da5ce97ca6cf861c775a7..037d47eebc88978e8f9a3d64bf09182ca3013262 100644 (file)
--- a/plugins/ctf/fs/fs.h
+++ b/plugins/ctf/fs/fs.h
@@ -29,9 +29,9 @@
  */
 
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/plugin/component.h>
+#include <babeltrace/component/component.h>
+#include "data-stream.h"
 
-#define CTF_FS_COMPONENT_NAME "fs"
 #define CTF_FS_COMPONENT_DESCRIPTION \
        "Component used to read a CTF trace located on a file system."
 
@@ -60,6 +60,8 @@ struct ctf_fs_stream {
        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;
+       /* A stream is assumed to be indexed. */
+       struct index index;
        void *mmap_addr;
        /* Max length of chunk to mmap() when updating the current mapping. */
        size_t mmap_max_len;
@@ -79,7 +81,6 @@ struct ctf_fs_stream {
 
 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
@@ -104,7 +105,24 @@ struct ctf_fs_component {
 };
 
 BT_HIDDEN
-enum bt_component_status ctf_fs_init(struct bt_component *source,
-               struct bt_value *params);
+enum bt_component_status ctf_fs_init(struct bt_private_component *source,
+               struct bt_value *params, void *init_method_data);
+
+BT_HIDDEN
+void ctf_fs_finalize(struct bt_private_component *component);
+
+BT_HIDDEN
+enum bt_notification_iterator_status ctf_fs_iterator_init(
+               struct bt_private_notification_iterator *it,
+               struct bt_private_port *port);
+
+void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
+
+struct bt_notification_iterator_next_return ctf_fs_iterator_next(
+               struct bt_private_notification_iterator *iterator);
+
+BT_HIDDEN
+struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
+               const char *object, struct bt_value *params);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */