X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-plugin.c;h=a10a1b21235acad04b7ad85c1de16081ec77c621;hp=a1fbb9e826efc903009e777a70dc0fd7522004c4;hb=21fe3eb3b83998d6fad94f7ec346d57593afe8c1;hpb=4e58c7d3a75d70c46186e33680cc16533430c6a9 diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c index a1fbb9e8..a10a1b21 100644 --- a/formats/lttng-live/lttng-live-plugin.c +++ b/formats/lttng-live/lttng-live-plugin.c @@ -215,6 +215,17 @@ gboolean g_uint64p_equal(gconstpointer a, gconstpointer b) return TRUE; } +static void free_session_streams(struct lttng_live_session *lsession) +{ + struct lttng_live_viewer_stream *lvstream, *tmp; + + bt_list_for_each_entry_safe(lvstream, tmp, &lsession->stream_list, + stream_node) { + bt_list_del(&lvstream->stream_node); + g_free(lvstream); + } +} + static int lttng_live_open_trace_read(const char *path) { int ret = 0; @@ -223,6 +234,8 @@ static int lttng_live_open_trace_read(const char *path) ctx = g_new0(struct lttng_live_ctx, 1); ctx->session = g_new0(struct lttng_live_session, 1); + BT_INIT_LIST_HEAD(&ctx->session->stream_list); + /* We need a pointer to the context from the packet_seek function. */ ctx->session->ctx = ctx; @@ -263,8 +276,8 @@ static int lttng_live_open_trace_read(const char *path) end_free: g_hash_table_destroy(ctx->session->ctf_traces); + free_session_streams(ctx->session); g_free(ctx->session); - g_free(ctx->session->streams); g_free(ctx); if (lttng_live_should_quit()) {