X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live.h;h=9739078a52e67278ca3b9d85962700e9a317cfc1;hp=ef799fd7f5d402fc420cde3bd76e6fea765b1739;hb=bb35f032b52330cfb17c144bfed81f2b1569f308;hpb=21fe3eb3b83998d6fad94f7ec346d57593afe8c1

diff --git a/formats/lttng-live/lttng-live.h b/formats/lttng-live/lttng-live.h
index ef799fd7..9739078a 100644
--- a/formats/lttng-live/lttng-live.h
+++ b/formats/lttng-live/lttng-live.h
@@ -66,7 +66,9 @@ struct lttng_live_viewer_stream {
 	struct lttng_live_session *session;
 	struct lttng_live_ctf_trace *ctf_trace;
 	struct lttng_viewer_index current_index;
-	struct bt_list_head stream_node;
+	struct bt_list_head session_stream_node;	/* Owns stream. */
+	struct bt_list_head trace_stream_node;
+	int in_trace;
 	char path[PATH_MAX];
 };
 
@@ -74,6 +76,7 @@ struct lttng_live_session {
 	uint64_t live_timer_interval;
 	uint64_t stream_count;
 	struct lttng_live_ctx *ctx;
+	/* The session stream list owns the lttng_live_viewer_stream object. */
 	struct bt_list_head stream_list;
 	GHashTable *ctf_traces;
 };
@@ -81,7 +84,8 @@ struct lttng_live_session {
 struct lttng_live_ctf_trace {
 	uint64_t ctf_trace_id;
 	struct lttng_live_viewer_stream *metadata_stream;
-	GPtrArray *streams;
+	/* The trace has a list of streams, but it has no ownership on them. */
+	struct bt_list_head stream_list;
 	FILE *metadata_fp;
 	struct bt_trace_handle *handle;
 	int trace_id;