if (ctx->on_recv_channel != NULL) {
ret = ctx->on_recv_channel(channel);
if (ret == 0) {
- ret = consumer_add_channel(channel);
+ ret = consumer_add_channel(channel, ctx);
} else if (ret < 0) {
/* Most likely an ENOMEM. */
lttng_consumer_send_error(ctx, LTTCOMM_CONSUMERD_OUTFD_ERROR);
goto error;
}
} else {
- ret = consumer_add_channel(channel);
+ ret = consumer_add_channel(channel, ctx);
}
DBG("UST consumer channel added (key: %" PRIu64 ")", channel->key);
goto error;
}
- ret = ustctl_stream_close_wakeup_fd(stream->ustream);
- if (ret < 0) {
- goto error;
- }
-
error:
return ret;
}
goto error;
}
+ ret = ustctl_channel_close_wakeup_fd(channel->uchan);
+ if (ret < 0) {
+ goto error;
+ }
+
/* The channel was sent successfully to the sessiond at this point. */
cds_list_for_each_entry(stream, &channel->streams.head, send_node) {
/* Try to send the stream to the relayd if one is available. */
goto error;
}
+ channel->wait_fd = ustctl_channel_get_wait_fd(channel->uchan);
+
+ if (ret < 0) {
+ goto error;
+ }
+
/* Open all streams for this channel. */
ret = create_ust_streams(channel, ctx);
if (ret < 0) {
}
rcu_read_unlock();
}
+
+void lttng_ustconsumer_close_stream_wakeup(struct lttng_consumer_stream *stream)
+{
+ int ret;
+
+ ret = ustctl_stream_close_wakeup_fd(stream->ustream);
+ if (ret < 0) {
+ ERR("Unable to close wakeup fd");
+ }
+}