/* Bail out if consumer is disabled */
if (!consumer->enabled) {
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
DBG3("Consumer is disabled");
goto error;
}
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);
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;
}
/*
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,
- 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;
/* Bail out if consumer is disabled */
if (!consumer->enabled) {
- ret = LTTCOMM_OK;
+ ret = LTTNG_OK;
goto error;
}