Fix: multiple consumer locking problems

[lttng-tools.git] / src / bin / lttng-sessiond / trace-ust.c

diff --git a/src/bin/lttng-sessiond/trace-ust.c b/src/bin/lttng-sessiond/trace-ust.c
index 4001ec87bdd8359f6224a1915e84c62f9c22486a..3e382b7a5fb738eb11f7fb5041bce65657067249 100644 (file)
--- 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_free_session;
        }
 
        /*
@@ -123,17 +123,21 @@ 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;
+               }
 
-       /* 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_free_session;
+               }
        }
 
        DBG2("UST trace session create successful");
@@ -574,6 +578,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();