projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix: consumer should await for initial streams
[lttng-tools.git]
/
src
/
bin
/
lttng-sessiond
/
consumer.c
diff --git
a/src/bin/lttng-sessiond/consumer.c
b/src/bin/lttng-sessiond/consumer.c
index b35c91195391b6c106e277443dd4a3af60d7cbc8..d33f85f1bf548659a050c180f517a98c180de7fe 100644
(file)
--- a/
src/bin/lttng-sessiond/consumer.c
+++ b/
src/bin/lttng-sessiond/consumer.c
@@
-48,7
+48,7
@@
int consumer_send_destroy_relayd(struct consumer_socket *sock,
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
- ret = LTT
COMM
_OK;
+ ret = LTT
NG
_OK;
DBG3("Consumer is disabled");
goto error;
}
DBG3("Consumer is disabled");
goto error;
}
@@
-486,7
+486,8
@@
void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
int channel_key,
uint64_t max_sb_size,
uint64_t mmap_len,
int channel_key,
uint64_t max_sb_size,
uint64_t mmap_len,
- const char *name)
+ const char *name,
+ unsigned int nb_init_streams)
{
assert(msg);
{
assert(msg);
@@
-500,6
+501,7
@@
void consumer_init_channel_comm_msg(struct lttcomm_consumer_msg *msg,
msg->u.channel.channel_key = channel_key;
msg->u.channel.max_sb_size = max_sb_size;
msg->u.channel.mmap_len = mmap_len;
msg->u.channel.channel_key = channel_key;
msg->u.channel.max_sb_size = max_sb_size;
msg->u.channel.mmap_len = mmap_len;
+ msg->u.channel.nb_init_streams = nb_init_streams;
}
/*
}
/*
@@
-611,7
+613,7
@@
int consumer_send_relayd_socket(int consumer_sock,
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
- ret = LTT
COMM
_OK;
+ ret = LTT
NG
_OK;
goto error;
}
goto error;
}
This page took
0.031828 seconds
and
5
git commands to generate.