Add query executor

[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..46fa9d8c5c44c319489a7c3f821276ddb249b553 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 {
@@ -107,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;
 };
@@ -128,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
@@ -138,12 +142,14 @@ 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_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
 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);