}
case LTTNG_CONSUMER_ADD_STREAM:
{
- int fd;
+ int fd, stream_pipe;
struct consumer_relayd_sock_pair *relayd = NULL;
struct lttng_consumer_stream *new_stream;
int alloc_ret = 0;
}
}
- /* Send stream to the metadata thread */
+ /* Get the right pipe where the stream will be sent. */
if (new_stream->metadata_flag) {
- do {
- ret = write(ctx->consumer_metadata_pipe[1], &new_stream,
- sizeof(new_stream));
- } while (ret < 0 && errno == EINTR);
- if (ret < 0) {
- PERROR("write metadata pipe");
- consumer_del_stream(new_stream, NULL);
- }
+ stream_pipe = ctx->consumer_metadata_pipe[1];
} else {
- ret = consumer_add_stream(new_stream);
- if (ret) {
- ERR("Consumer add stream %d failed. Continuing",
- new_stream->key);
- consumer_del_stream(new_stream, NULL);
- goto end_nosignal;
- }
+ stream_pipe = ctx->consumer_data_pipe[1];
}
- DBG("Kernel consumer_add_stream (%d)", fd);
+ do {
+ ret = write(stream_pipe, &new_stream, sizeof(new_stream));
+ } while (ret < 0 && errno == EINTR);
+ if (ret < 0) {
+ PERROR("Consumer write %s stream to pipe %d",
+ new_stream->metadata_flag ? "metadata" : "data",
+ stream_pipe);
+ consumer_del_stream(new_stream, NULL);
+ goto end_nosignal;
+ }
+
+ DBG("Kernel consumer ADD_STREAM %s (fd: %d) with relayd id %" PRIu64,
+ msg.u.stream.path_name, fd, new_stream->relayd_stream_id);
break;
}
case LTTNG_CONSUMER_UPDATE_STREAM:
goto end_nosignal;
}
- /*
- * Wake-up the other end by writing a null byte in the pipe (non-blocking).
- * Important note: Because writing into the pipe is non-blocking (and
- * therefore we allow dropping wakeup data, as long as there is wakeup data
- * present in the pipe buffer to wake up the other end), the other end
- * should perform the following sequence for waiting:
- *
- * 1) empty the pipe (reads).
- * 2) perform update operation.
- * 3) wait on the pipe (poll).
- */
- do {
- ret = write(ctx->consumer_poll_pipe[1], "", 1);
- } while (ret < 0 && errno == EINTR);
end_nosignal:
rcu_read_unlock();