X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=formats%2Flttng-live%2Flttng-live-plugin.c;h=0bebdd890aca35a8658350eafdad81fadc99eef1;hb=51a19e72defb19d9f9cabbbe3006ef241b0cf9ac;hp=771801ce9c655d59bac690fd6b0e34863dd54105;hpb=857eaa682bde4acfb5b9437ac9ace2d429d7107a;p=babeltrace.git

diff --git a/formats/lttng-live/lttng-live-plugin.c b/formats/lttng-live/lttng-live-plugin.c
index 771801ce..0bebdd89 100644
--- a/formats/lttng-live/lttng-live-plugin.c
+++ b/formats/lttng-live/lttng-live-plugin.c
@@ -41,6 +41,14 @@
 
 static volatile int should_quit;
 
+void bt_lttng_live_hook(void)
+{
+	/*
+	 * Dummy function to prevent the linker from discarding this format as
+	 * "unused" in static builds.
+	 */
+}
+
 int lttng_live_should_quit(void)
 {
 	return should_quit;
@@ -95,7 +103,7 @@ int setup_sighandler(void)
 static
 int parse_url(const char *path, struct lttng_live_ctx *ctx)
 {
-	char remain[3][MAXNAMLEN];
+	char remain[3][MAXNAMLEN] = { { 0 } };
 	int ret = -1, proto, proto_offset = 0;
 	size_t path_len = strlen(path);	/* not accounting \0 */
 
@@ -119,6 +127,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",
@@ -173,6 +185,7 @@ int parse_url(const char *path, struct lttng_live_ctx *ctx)
 	if (ret != 2) {
 		fprintf(stderr, "[error] Format : "
 			"net://<hostname>/host/<traced_hostname>/<session_name>\n");
+		ret = -1;
 		goto end;
 	}
 
@@ -211,6 +224,21 @@ 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,
+			session_stream_node) {
+		/*
+		 * The stream should not be in trace anymore.
+		 */
+		assert(!lvstream->in_trace);
+		bt_list_del(&lvstream->session_stream_node);
+		g_free(lvstream);
+	}
+}
+
 static int lttng_live_open_trace_read(const char *path)
 {
 	int ret = 0;
@@ -219,6 +247,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;
 
@@ -258,9 +288,10 @@ static int lttng_live_open_trace_read(const char *path)
 	}
 
 end_free:
+	g_array_free(ctx->session_ids, TRUE);
 	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()) {