{
int ret, fd;
struct lttcomm_consumer_msg lum;
- struct cds_lfht_iter iter;
- struct cds_lfht_node *node;
+ struct ltt_ust_stream *stream;
DBG("Sending streams of channel %s to UST consumer", uchan->name);
goto error;
}
- rcu_read_lock();
- hashtable_get_first(uchan->streams, &iter);
- while ((node = hashtable_iter_get_node(&iter)) != NULL) {
- struct ltt_ust_stream *stream =
- caa_container_of(node, struct ltt_ust_stream, node);
+ cds_list_for_each_entry(stream, &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;
strncpy(lum.u.stream.path_name, stream->pathname, PATH_MAX - 1);
lum.u.stream.path_name[PATH_MAX - 1] = '\0';
perror("send consumer stream ancillary data");
goto error;
}
-
-next:
- hashtable_get_next(uchan->streams, &iter);
}
- rcu_read_unlock();
DBG("consumer channel streams sent");
ret = send_channel_streams(sock, uchan);
if (ret < 0) {
+ rcu_read_unlock();
goto error;
}
hashtable_get_next(usess->channels, &iter);