Fix possible NULL UST session on start trace

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

diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
index 444ff6eeea9f6b79c1c93259890927b52a27bf28..ca008d4adf65d0165d3eaca6f06f149361081594 100644 (file)
--- a/lttng-sessiond/ust-consumer.c
+++ b/lttng-sessiond/ust-consumer.c
@@ -75,7 +75,11 @@ static int send_channel_streams(int sock,
                lum.u.stream.channel_key = uchan->obj->shm_fd;
                lum.u.stream.stream_key = stream->obj->shm_fd;
                lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM;
-               lum.u.stream.output = uchan->attr.output;
+               /*
+                * FIXME Hack alert! we force MMAP for now. Mixup
+                * between EVENT and UST enums elsewhere.
+                */
+               lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT;
                lum.u.stream.mmap_len = stream->obj->memory_map_size;
                strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
                lum.u.stream.path_name[PATH_MAX - 1] = '\0';
@@ -171,6 +175,7 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
 
                ret = send_channel_streams(sock, uchan);
                if (ret < 0) {
+                       rcu_read_unlock();
                        goto error;
                }
                hashtable_get_next(usess->channels, &iter);