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 c9197bd8ecf9afc682f3b9e43740cf7fe0298aca..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;
}
/*
}
/*
@@
-560,9
+562,12
@@
int consumer_send_stream(int sock, struct consumer_output *dst,
break;
case CONSUMER_DST_LOCAL:
/* Add stream file name to stream path */
break;
case CONSUMER_DST_LOCAL:
/* Add stream file name to stream path */
- strncat(msg->u.stream.path_name, "/", sizeof(msg->u.stream.path_name));
+ strncat(msg->u.stream.path_name, "/",
+ sizeof(msg->u.stream.path_name) -
+ strlen(msg->u.stream.path_name) - 1);
strncat(msg->u.stream.path_name, msg->u.stream.name,
strncat(msg->u.stream.path_name, msg->u.stream.name,
- sizeof(msg->u.stream.path_name));
+ sizeof(msg->u.stream.path_name) -
+ strlen(msg->u.stream.path_name) - 1);
msg->u.stream.path_name[sizeof(msg->u.stream.path_name) - 1] = '\0';
/* Indicate that the stream is NOT network */
msg->u.stream.net_index = -1;
msg->u.stream.path_name[sizeof(msg->u.stream.path_name) - 1] = '\0';
/* Indicate that the stream is NOT network */
msg->u.stream.net_index = -1;
@@
-608,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.026218 seconds
and
4
git commands to generate.