API change for lttng_list_domains prototype

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

diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c
index b83fcc435f8aaf9ced379aa3fd512572b5aa502f..8a2ba728d76dc0b8a6e34c66a90819bc6a12e7f4 100644 (file)
--- a/lttng-sessiond/ust-consumer.c
+++ b/lttng-sessiond/ust-consumer.c
@@ -38,7 +38,7 @@ static int send_channel_streams(int sock,
 {
        int ret, fd;
        struct lttcomm_consumer_msg lum;
-       struct ltt_ust_stream *stream;
+       struct ltt_ust_stream *stream, *tmp;
 
        DBG("Sending streams of channel %s to UST consumer", uchan->name);
 
@@ -46,8 +46,11 @@ static int send_channel_streams(int sock,
        lum.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL;
 
        /*
-        * We need to keep shm_fd open to make sure this key stays unique within
-        * the session daemon.
+        * We need to keep shm_fd open while we transfer the stream file
+        * descriptors to make sure this key stays unique within the
+        * session daemon. We can free the channel shm_fd without
+        * problem after we finished sending stream fds for that
+        * channel.
         */
        lum.u.channel.channel_key = uchan->obj->shm_fd;
        lum.u.channel.max_sb_size = uchan->attr.subbuf_size;
@@ -65,7 +68,7 @@ static int send_channel_streams(int sock,
                goto error;
        }
 
-       cds_list_for_each_entry(stream, &uchan->streams.head, list) {
+       cds_list_for_each_entry_safe(stream, tmp, &uchan->streams.head, list) {
                int fds[2];
 
                if (!stream->obj->shm_fd) {
@@ -75,7 +78,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';
@@ -117,6 +124,11 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess)
 
        DBG("Sending metadata stream fd");
 
+       if (consumer_fd < 0) {
+               ERR("Consumer has negative file descriptor");
+               return -EINVAL;
+       }
+
        if (usess->metadata->obj->shm_fd != 0) {
                int fd;
                int fds[2];