Network streaming support

[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 1d48002d07297dad4ff88f8903c3d9ab422416b6..cd1660d593dbf16a96c662a3bf0a7a143653cb9a 100644 (file)
--- a/src/bin/lttng-sessiond/trace-ust.c
+++ b/src/bin/lttng-sessiond/trace-ust.c
@@ -109,6 +109,26 @@ struct ltt_ust_session *trace_ust_create_session(char *path,
        /* Alloc UST global domain channels' HT */
        lus->domain_global.channels = lttng_ht_new(0, LTTNG_HT_TYPE_STRING);
 
+       lus->consumer = consumer_create_output(CONSUMER_DST_LOCAL);
+       if (lus->consumer == NULL) {
+               goto error;
+       }
+
+       /*
+        * The tmp_consumer stays NULL until a set_consumer_uri command is
+        * executed. At this point, the consumer should be nullify until an
+        * enable_consumer command. This assignment is symbolic since we've zmalloc
+        * the struct.
+        */
+       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;
+       }
+
        /* Set session path */
        ret = snprintf(lus->pathname, PATH_MAX, "%s/ust", path);
        if (ret < 0) {
@@ -152,7 +172,7 @@ struct ltt_ust_channel *trace_ust_create_channel(struct lttng_channel *chan,
        luc->attr.num_subbuf = chan->attr.num_subbuf;
        luc->attr.switch_timer_interval = chan->attr.switch_timer_interval;
        luc->attr.read_timer_interval = chan->attr.read_timer_interval;
-       luc->attr.output = chan->attr.output;
+       luc->attr.output = (enum lttng_ust_output) chan->attr.output;
 
        /* Translate to UST output enum */
        switch (luc->attr.output) {