X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Ftrace-ust.c;h=864a4b0d1bb0dcd25c2e2de54b16999f8d3d22cc;hb=edb8b045f1abe76804200921e7b2eb42ec66b5e4;hp=cd1660d593dbf16a96c662a3bf0a7a143653cb9a;hpb=00e2e675d54dc726a7c8f8887c889cc8ef022003;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index cd1660d59..864a4b0d1 100644
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -111,7 +111,7 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
 
 	lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
 	if (lus->consumer == NULL) {
-		goto error;
+		goto error_consumer;
 	}
 
 	/*
@@ -123,24 +123,30 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
 	lus->tmp_consumer = NULL;
 
 	/* Use the default consumer output which is the tracing session path. */
-	ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX, "%s/ust", path);
-	if (ret < 0) {
-		PERROR("snprintf UST consumer trace path");
-		goto error;
-	}
+	if (path && strlen(path) > 0) {
+		ret = snprintf(lus->consumer->dst.trace_path, PATH_MAX,
+				"%s" DEFAULT_UST_TRACE_DIR, path);
+		if (ret < 0) {
+			PERROR("snprintf UST consumer trace path");
+			goto error_path;
+		}
 
-	/* Set session path */
-	ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
-	if (ret < 0) {
-		PERROR("snprintf kernel traces path");
-		goto error_free_session;
+		/* Set session path */
+		ret = snprintf(lus->pathname, PATH_MAX, "%s" DEFAULT_UST_TRACE_DIR,
+				path);
+		if (ret < 0) {
+			PERROR("snprintf kernel traces path");
+			goto error_path;
+		}
 	}
 
 	DBG2("UST trace session create successful");
 
 	return lus;
 
-error_free_session:
+error_path:
+	consumer_destroy_output(lus->consumer);
+error_consumer:
 	lttng_ht_destroy(lus->domain_global.channels);
 	lttng_ht_destroy(lus->domain_exec);
 	lttng_ht_destroy(lus->domain_pid);
@@ -410,7 +416,7 @@ void trace_ust_destroy_event(struct ltt_ust_event *event)
 {
 	DBG2("Trace destroy UST event %s", event->attr.name);
 	destroy_contexts(event->ctx);
-
+	free(event->filter);
 	free(event);
 }
 
@@ -574,6 +580,9 @@ void trace_ust_destroy_session(struct ltt_ust_session *session)
 	destroy_domain_pid(session->domain_pid);
 	destroy_domain_exec(session->domain_exec);
 
+	consumer_destroy_output(session->consumer);
+	consumer_destroy_output(session->tmp_consumer);
+
 	free(session);
 
 	rcu_read_unlock();