projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: *_domain are never used by create_session
[lttng-tools.git]
/
src
/
common
/
ust-consumer
/
ust-consumer.c
diff --git
a/src/common/ust-consumer/ust-consumer.c
b/src/common/ust-consumer/ust-consumer.c
index b26cc19f923d23da7806be92069c395b7a99aaa3..cbad61144b1d1ec391cf1649a85672751d1311be 100644
(file)
--- a/
src/common/ust-consumer/ust-consumer.c
+++ b/
src/common/ust-consumer/ust-consumer.c
@@
-540,11
+540,11
@@
error:
}
/*
}
/*
- * Send channel to sessiond.
+ * Send channel to sessiond
and relayd if applicable
.
*
* Return 0 on success or else a negative value.
*/
*
* Return 0 on success or else a negative value.
*/
-static int send_
sessiond_channel
(int sock,
+static int send_
channel_to_sessiond_and_relayd
(int sock,
struct lttng_consumer_channel *channel,
struct lttng_consumer_local_data *ctx, int *relayd_error)
{
struct lttng_consumer_channel *channel,
struct lttng_consumer_local_data *ctx, int *relayd_error)
{
@@
-564,6
+564,8
@@
static int send_sessiond_channel(int sock,
health_code_update();
/* Try to send the stream to the relayd if one is available. */
health_code_update();
/* Try to send the stream to the relayd if one is available. */
+ DBG("Sending stream %" PRIu64 " of channel \"%s\" to relayd",
+ stream->key, channel->name);
ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
if (ret < 0) {
/*
ret = consumer_send_relayd_stream(stream, stream->chan->pathname);
if (ret < 0) {
/*
@@
-1577,8
+1579,9
@@
int lttng_ustconsumer_recv_cmd(struct lttng_consumer_local_data *ctx,
health_code_update();
health_code_update();
- /* Send everything to sessiond. */
- ret = send_sessiond_channel(sock, channel, ctx, &relayd_err);
+ /* Send the channel to sessiond (and relayd, if applicable). */
+ ret = send_channel_to_sessiond_and_relayd(sock, channel, ctx,
+ &relayd_err);
if (ret < 0) {
if (relayd_err) {
/*
if (ret < 0) {
if (relayd_err) {
/*
This page took
0.02558 seconds
and
5
git commands to generate.