Support flight recorder mode for a session

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

diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index 93c1f713562b016f7147ba16e402dae18ce88e0d..72b68bb7f7bed39d03ed5860381ef70d94df5ad8 100644 (file)
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -61,7 +61,7 @@ static char *setup_trace_path(struct consumer_output *consumer,
        /* Get correct path name destination */
        if (consumer->type == CONSUMER_DST_LOCAL) {
                /* Set application path to the destination path */
-               ret = snprintf(pathname, PATH_MAX, "%s/%s/%s",
+               ret = snprintf(pathname, PATH_MAX, "%s%s%s",
                                consumer->dst.trace_path, consumer->subdir, ua_sess->path);
                if (ret < 0) {
                        PERROR("snprintf channel path");
@@ -78,7 +78,7 @@ static char *setup_trace_path(struct consumer_output *consumer,
                        }
                }
        } else {
-               ret = snprintf(pathname, PATH_MAX, "%s/%s", consumer->subdir,
+               ret = snprintf(pathname, PATH_MAX, "%s%s", consumer->subdir,
                                ua_sess->path);
                if (ret < 0) {
                        PERROR("snprintf channel path");
@@ -157,7 +157,8 @@ static int ask_channel_creation(struct ust_app_session *ua_sess,
                        registry->uuid,
                        chan_id,
                        ua_chan->tracefile_size,
-                       ua_chan->tracefile_count);
+                       ua_chan->tracefile_count,
+                       ua_sess->output_traces);
 
        health_code_update();
 
@@ -203,6 +204,12 @@ int ust_consumer_ask_channel(struct ust_app_session *ua_sess,
        assert(socket->fd >= 0);
        assert(registry);
 
+       if (!consumer->enabled) {
+               ret = -LTTNG_ERR_NO_CONSUMER;
+               DBG3("Consumer is disabled");
+               goto error;
+       }
+
        pthread_mutex_lock(socket->lock);
 
        ret = ask_channel_creation(ua_sess, ua_chan, consumer, socket, registry);