#include <common/defaults.h>
#include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
#include "kernel-consumer.h"
static char *create_channel_path(struct consumer_output *consumer,
CONSUMER_CHANNEL_TYPE_DATA,
channel->channel->attr.tracefile_size,
channel->channel->attr.tracefile_count,
- monitor);
+ monitor,
+ channel->channel->attr.live_timer_interval);
health_code_update();
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
0, 0,
- monitor);
+ monitor, 0);
health_code_update();
return ret;
}
+/*
+ * Sending the notification that all streams were sent with STREAMS_SENT.
+ */
+int kernel_consumer_streams_sent(struct consumer_socket *sock,
+ struct ltt_kernel_session *session, uint64_t channel_key)
+{
+ int ret;
+ struct lttcomm_consumer_msg lkm;
+ struct consumer_output *consumer;
+
+ assert(sock);
+ assert(session);
+
+ DBG("Sending streams_sent");
+ /* Get consumer output pointer */
+ consumer = session->consumer;
+
+ /* Prep stream consumer message */
+ consumer_init_streams_sent_comm_msg(&lkm,
+ LTTNG_CONSUMER_STREAMS_SENT,
+ channel_key, consumer->net_seq_index);
+
+ health_code_update();
+
+ /* Send stream and file descriptor */
+ ret = consumer_send_msg(sock, &lkm);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ return ret;
+}
+
/*
* Send all stream fds of kernel channel to the consumer.
*/
{
int ret;
struct ltt_kernel_stream *stream;
+ uint64_t channel_key = -1ULL;
/* Safety net */
assert(channel);
if (ret < 0) {
goto error;
}
+ if (channel_key == -1ULL) {
+ channel_key = channel->fd;
+ }
+ }
+
+ if (!monitor || channel_key == -1ULL) {
+ goto end;
+ }
+
+ /* Add stream on the kernel consumer side. */
+ ret = kernel_consumer_streams_sent(sock, session, channel_key);
+ if (ret < 0) {
+ goto error;
}
+end:
error:
return ret;
}
assert(channel);
assert(socket);
- assert(socket->fd >= 0);
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
assert(metadata);
assert(socket);
- assert(socket->fd >= 0);
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);