X-Git-Url: http://git.efficios.com/?p=babeltrace.git;a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-plugin.c;h=a10a1b21235acad04b7ad85c1de16081ec77c621;hp=adb7249dae8e16e5a30c82b34fff9468d0536e88;hb=21fe3eb3b83998d6fad94f7ec346d57593afe8c1;hpb=0206bb4ab13c24263966d56fbe5bda7b1645de51

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index adb7249d..a10a1b21 100644
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -119,6 +119,10 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
 	if (proto_offset > path_len) {
 		goto end;
 	}
+	if (proto == 6) {
+		fprintf(stderr, "[error] IPv6 is currently unsupported by lttng-live\n");
+		goto end;
+	}
 	/* TODO : parse for IPv6 as well */
 	/* Parse the hostname or IP */
 	ret = sscanf(&path[proto_offset], "%[a-zA-Z.0-9%-]%s",
@@ -211,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;
@@ -219,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;
 
@@ -259,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()) {
@@ -292,6 +309,12 @@ struct bt_trace_descriptor *lttng_live_open_trace(const char *path, int flags,
 	pos->parent.rw_table = NULL;
 	pos->parent.event_cb = NULL;
 	pos->parent.trace = &pos->trace_descriptor;
+	/*
+	 * Since we do *everything* in this function, we are skipping
+	 * the output plugin handling that is part of Babeltrace 1.x.
+	 * Therefore, don't expect the --output cmd line option to work.
+	 * This limits the output of lttng-live to stderr and stdout.
+	 */
 	if (lttng_live_open_trace_read(path) < 0) {
 		goto error;
 	}
@@ -307,7 +330,7 @@ int lttng_live_close_trace(struct bt_trace_descriptor *td)
 	struct ctf_text_stream_pos *pos =
 		container_of(td, struct ctf_text_stream_pos,
 			trace_descriptor);
-	free(pos);
+	g_free(pos);
 	return 0;
 }