src.ctf.fs: use one CTF notif iter per notification iterator

[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 c5c12fb4e6b22a13815053b5430bf59f4c73a982..64eab95b921bb9c45871edf8b496a69d7d1d14c2 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -60,11 +60,6 @@ struct ctf_fs_metadata {
        int bo;
 };
 
-struct ctf_fs_component_options {
-       int64_t clock_offset;
-       int64_t clock_offset_ns;
-};
-
 struct ctf_fs_component {
        /* Weak, guaranteed to exist */
        struct bt_private_component *priv_comp;
@@ -75,7 +70,7 @@ struct ctf_fs_component {
        /* Array of struct ctf_fs_trace *, owned by this */
        GPtrArray *traces;
 
-       struct ctf_fs_component_options options;
+       struct ctf_fs_metadata_config metadata_config;
 };
 
 struct ctf_fs_trace {
@@ -128,6 +123,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
@@ -143,7 +141,7 @@ struct bt_value *ctf_fs_query(struct bt_component_class *comp_class,
 
 BT_HIDDEN
 struct ctf_fs_trace *ctf_fs_trace_create(const char *path, const char *name,
-               struct metadata_overrides *overrides);
+               struct ctf_fs_metadata_config *config);
 
 BT_HIDDEN
 void ctf_fs_trace_destroy(struct ctf_fs_trace *trace);