X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=26e796a73bedeaf1dc263879233e3954da9c92c3;hb=56e18c4ce186892c36d7f2cb5078087425e60134;hp=534cb6b513cc2ec7afeaa6a485970d31e31ecc3a;hpb=d4393e0875e7b08f6ee97d617cc5f2c9286742a4;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index 534cb6b5..26e796a7 100644
--- 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;
 
@@ -100,7 +106,7 @@ struct ctf_fs_ds_file_group {
 	 * belong to this group (a single stream instance).
 	 *
 	 * You can call ctf_fs_ds_file_create() with one of those paths
-	 * and the CTF IR stream below.
+	 * and the trace IR stream below.
 	 */
 	GPtrArray *ds_file_infos;
 
@@ -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;