Rename bt_ctf_X -> bt_X, maintain backward compat. for pre-2.0 CTF writer

[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..bbac1bb4d96daf7ee4fcbf286b702ed118c26141 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -30,8 +30,7 @@
 
 #include <stdbool.h>
 #include <babeltrace/babeltrace-internal.h>
-#include <babeltrace/graph/component.h>
-#include <babeltrace/graph/clock-class-priority-map.h>
+#include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
 
@@ -50,7 +49,7 @@ struct ctf_fs_file {
 
 struct ctf_fs_metadata {
        /* Owned by this */
-       struct bt_ctf_trace *trace;
+       struct bt_trace *trace;
 
        /* Owned by this */
        char *text;
@@ -60,11 +59,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 +69,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 {
@@ -108,7 +102,13 @@ struct ctf_fs_ds_file_group {
        GPtrArray *ds_file_infos;
 
        /* Owned by this */
-       struct bt_ctf_stream *stream;
+       struct bt_stream_class *stream_class;
+
+       /* Owned by this */
+       struct bt_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 +128,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_notif_iter *notif_iter;
 };
 
 BT_HIDDEN
@@ -138,12 +141,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_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
 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);
@@ -156,13 +161,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 */