X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=lttng-sessiond%2Fust-consumer.c;h=c02cbf96588c2c4701c7c9e9667c590582c1723e;hp=605870d52028c77f852ef6b6b091e24047d97cd2;hb=fc34caaa25f9780eb8509f243f910c3f2aaa5a69;hpb=ee6b7fb274d27a8f7f69f69cb195cad9c5df8a40 diff --git a/lttng-sessiond/ust-consumer.c b/lttng-sessiond/ust-consumer.c index 605870d52..c02cbf965 100644 --- a/lttng-sessiond/ust-consumer.c +++ b/lttng-sessiond/ust-consumer.c @@ -23,24 +23,23 @@ #include #include +#include #include #include #include -#include "hashtable.h" #include "ust-consumer.h" /* * Send all stream fds of UST channel to the consumer. */ static int send_channel_streams(int sock, - struct ust_app_channel *uchan) + struct ust_app_channel *uchan, + uid_t uid, gid_t gid) { - int ret, fds[2]; - struct ltt_ust_stream *stream; + int ret, fd; struct lttcomm_consumer_msg lum; - struct cds_lfht_iter iter; - struct cds_lfht_node *node; + struct ltt_ust_stream *stream, *tmp; DBG("Sending streams of channel %s to UST consumer", uchan->name); @@ -48,8 +47,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; @@ -60,32 +62,31 @@ static int send_channel_streams(int sock, perror("send consumer channel"); goto error; } - fds[0] = uchan->obj->shm_fd; - fds[1] = uchan->obj->wait_fd; - ret = lttcomm_send_fds_unix_sock(sock, fds, 2); + fd = uchan->obj->shm_fd; + ret = lttcomm_send_fds_unix_sock(sock, &fd, 1); if (ret < 0) { perror("send consumer channel ancillary data"); goto error; } - - rcu_read_lock(); - hashtable_get_first(uchan->streams, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - stream = caa_container_of(node, struct ltt_ust_stream, node); - + cds_list_for_each_entry_safe(stream, tmp, &uchan->streams.head, list) { int fds[2]; if (!stream->obj->shm_fd) { - goto next; + continue; } - lum.cmd_type = LTTNG_CONSUMER_ADD_STREAM; 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; + lum.u.stream.uid = uid; + lum.u.stream.gid = gid; strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1); lum.u.stream.path_name[PATH_MAX - 1] = '\0'; DBG("Sending stream %d to consumer", lum.u.stream.stream_key); @@ -102,11 +103,7 @@ static int send_channel_streams(int sock, perror("send consumer stream ancillary data"); goto error; } - -next: - hashtable_get_next(uchan->streams, &iter); } - rcu_read_unlock(); DBG("consumer channel streams sent"); @@ -123,30 +120,34 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess) { int ret = 0; int sock = consumer_fd; - struct cds_lfht_iter iter; - struct cds_lfht_node *node; + struct lttng_ht_iter iter; struct lttcomm_consumer_msg lum; - struct ust_app_channel *uchan; + struct ust_app_channel *ua_chan; 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]; /* Send metadata channel fd */ lum.cmd_type = LTTNG_CONSUMER_ADD_CHANNEL; lum.u.channel.channel_key = usess->metadata->obj->shm_fd; lum.u.channel.max_sb_size = usess->metadata->attr.subbuf_size; - lum.u.channel.mmap_len = 0; /* for kernel */ + lum.u.channel.mmap_len = usess->metadata->obj->memory_map_size; DBG("Sending metadata channel %d to consumer", lum.u.channel.channel_key); ret = lttcomm_send_unix_sock(sock, &lum, sizeof(lum)); if (ret < 0) { perror("send consumer channel"); goto error; } - fds[0] = usess->metadata->obj->shm_fd; - fds[1] = usess->metadata->obj->wait_fd; - ret = lttcomm_send_fds_unix_sock(sock, fds, 2); + fd = usess->metadata->obj->shm_fd; + ret = lttcomm_send_fds_unix_sock(sock, &fd, 1); if (ret < 0) { perror("send consumer metadata channel"); goto error; @@ -159,6 +160,8 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess) lum.u.stream.state = LTTNG_CONSUMER_ACTIVE_STREAM; lum.u.stream.output = DEFAULT_UST_CHANNEL_OUTPUT; lum.u.stream.mmap_len = usess->metadata->stream_obj->memory_map_size; + lum.u.stream.uid = usess->uid; + lum.u.stream.gid = usess->gid; strncpy(lum.u.stream.path_name, usess->metadata->pathname, PATH_MAX - 1); lum.u.stream.path_name[PATH_MAX - 1] = '\0'; DBG("Sending metadata stream %d to consumer", lum.u.stream.stream_key); @@ -178,15 +181,13 @@ int ust_consumer_send_session(int consumer_fd, struct ust_app_session *usess) /* Send each channel fd streams of session */ rcu_read_lock(); - hashtable_get_first(usess->channels, &iter); - while ((node = hashtable_iter_get_node(&iter)) != NULL) { - uchan = caa_container_of(node, struct ust_app_channel, node); - - ret = send_channel_streams(sock, uchan); + cds_lfht_for_each_entry(usess->channels->ht, &iter.iter, ua_chan, + node.node) { + ret = send_channel_streams(sock, ua_chan, usess->uid, usess->gid); if (ret < 0) { + rcu_read_unlock(); goto error; } - hashtable_get_next(usess->channels, &iter); } rcu_read_unlock();