Split notification iterator API into base and specialized functions

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

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 13b0d07c6b5e802e64d50f38bef5523894ca7d37..f5eaabb8f739cfc5d6912f42e90eb1ea8e7298cc 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -102,9 +102,15 @@ struct ctf_fs_ds_file_group {
         */
        GPtrArray *ds_file_infos;
 
+       /* Owned by this */
+       struct bt_ctf_stream_class *stream_class;
+
        /* Owned by this */
        struct bt_ctf_stream *stream;
 
+       /* Stream (instance) ID; -1ULL means none */
+       uint64_t stream_id;
+
        /* Weak, belongs to component */
        struct ctf_fs_trace *ctf_fs_trace;
 };
@@ -123,6 +129,9 @@ struct ctf_fs_notif_iter_data {
 
        /* Which file the iterator is _currently_ operating on */
        size_t ds_file_info_index;
+
+       /* Owned by this */
+       struct bt_ctf_notif_iter *notif_iter;
 };
 
 BT_HIDDEN
@@ -133,7 +142,9 @@ BT_HIDDEN
 void ctf_fs_finalize(struct bt_private_component *component);
 
 BT_HIDDEN
-struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
+struct bt_component_class_query_method_return ctf_fs_query(
+               struct bt_component_class *comp_class,
+               struct bt_query_executor *query_exec,
                const char *object, struct bt_value *params);
 
 BT_HIDDEN
@@ -151,13 +162,13 @@ GList *ctf_fs_create_trace_names(GList *trace_paths, const char *base_path);
 
 BT_HIDDEN
 enum bt_notification_iterator_status ctf_fs_iterator_init(
-               struct bt_private_notification_iterator *it,
+               struct bt_private_connection_private_notification_iterator *it,
                struct bt_private_port *port);
 BT_HIDDEN
-void ctf_fs_iterator_finalize(struct bt_private_notification_iterator *it);
+void ctf_fs_iterator_finalize(struct bt_private_connection_private_notification_iterator *it);
 
 BT_HIDDEN
-struct bt_notification_iterator_next_return ctf_fs_iterator_next(
-               struct bt_private_notification_iterator *iterator);
+struct bt_notification_iterator_next_method_return ctf_fs_iterator_next(
+               struct bt_private_connection_private_notification_iterator *iterator);
 
 #endif /* BABELTRACE_PLUGIN_CTF_FS_H */