X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=plugins%2Fctf%2Ffs-src%2Ffs.h;h=63b299a09288bae6187b3bd6eaf389628eb52cd2;hb=1a9f7075566704f314c36f92339c2e2fed697523;hp=acc14a1a674bb60c0c32cf4ee798097f6df4533a;hpb=1c07c8a447070164bc709950997f848fc0cc98fe;p=babeltrace.git

diff --git a/plugins/ctf/fs-src/fs.h b/plugins/ctf/fs-src/fs.h
index acc14a1a..63b299a0 100644
--- a/plugins/ctf/fs-src/fs.h
+++ b/plugins/ctf/fs-src/fs.h
@@ -38,25 +38,43 @@ BT_HIDDEN
 extern bool ctf_fs_debug;
 
 struct ctf_fs_file {
+	/* Weak */
 	struct ctf_fs_component *ctf_fs;
+
+	/* Owned by this */
 	GString *path;
+
+	/* Owned by this */
 	FILE *fp;
+
 	off_t size;
 };
 
 struct ctf_fs_metadata {
+	/* Owned by this */
 	struct bt_ctf_trace *trace;
+
+	/* Owned by this */
+	char *text;
+
 	uint8_t uuid[16];
 	bool is_uuid_set;
 	int bo;
-	char *text;
 };
 
 struct ctf_fs_stream {
+	/* Owned by this */
 	struct ctf_fs_file *file;
+
+	/* Owned by this */
 	struct bt_ctf_stream *stream;
+
+	/* Owned by this */
 	struct bt_clock_class_priority_map *cc_prio_map;
+
+	/* Owned by this */
 	struct bt_ctf_notif_iter *notif_iter;
+
 	/* A stream is assumed to be indexed. */
 	struct index index;
 	void *mmap_addr;
@@ -81,21 +99,44 @@ struct ctf_fs_component_options {
 	uint64_t clock_offset_ns;
 };
 
-struct ctf_fs_port_data {
-	GString *path;
-};
-
 struct ctf_fs_component {
+	/* Weak */
 	struct bt_private_component *priv_comp;
-	GString *trace_path;
+
+	/* Array of struct ctf_fs_port_data *, owned by this */
+	GPtrArray *port_data;
+
+	/* Array of struct ctf_fs_trace *, owned by this */
+	GPtrArray *traces;
+
+	struct ctf_fs_component_options options;
 	FILE *error_fp;
 	size_t page_size;
-	struct ctf_fs_component_options options;
+};
+
+struct ctf_fs_trace {
+	/* Weak */
+	struct ctf_fs_component *ctf_fs;
+
+	/* 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_port_data *, owned by this */
-	GPtrArray *port_data;
+	/* Owned by this */
+	GString *path;
+
+	/* Owned by this */
+	GString *name;
+};
+
+struct ctf_fs_port_data {
+	/* Owned by this */
+	GString *path;
+
+	/* Weak */
+	struct ctf_fs_trace *ctf_fs_trace;
 };
 
 BT_HIDDEN