Make API CTF-agnostic

[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 534cb6b513cc2ec7afeaa6a485970d31e31ecc3a..c72be5e03dd3000b065ef1521384be843d7a5cfc 100644 (file)
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -33,6 +33,7 @@
 #include <babeltrace/babeltrace.h>
 #include "data-stream-file.h"
 #include "metadata.h"
+#include "../common/metadata/decoder.h"
 
 BT_HIDDEN
 extern bool ctf_fs_debug;
@@ -48,9 +49,17 @@ struct ctf_fs_file {
 };
 
 struct ctf_fs_metadata {
+       /* Owned by this */
+       struct ctf_metadata_decoder *decoder;
+
        /* Owned by this */
        struct bt_trace *trace;
 
+       /* Weak (owned by `decoder` above) */
+       struct ctf_trace_class *tc;
+
+       /* Owned by this */
+
        /* Owned by this */
        char *text;
 
@@ -76,9 +85,6 @@ struct ctf_fs_trace {
        /* Owned by this */
        struct ctf_fs_metadata *metadata;
 
-       /* Owned by this */
-       struct bt_clock_class_priority_map *cc_prio_map;
-
        /* Array of struct ctf_fs_ds_file_group *, owned by this */
        GPtrArray *ds_file_groups;
 
@@ -127,7 +133,7 @@ struct ctf_fs_port_data {
 
 struct ctf_fs_notif_iter_data {
        /* Weak */
-       struct bt_graph *graph;
+       struct bt_private_connection_private_notification_iterator *pc_notif_iter;
 
        /* Weak, belongs to ctf_fs_trace */
        struct ctf_fs_ds_file_group *ds_file_group;