*/
#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#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,
}
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
}
/* Prep channel message structure */
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();
health_code_update();
error:
+ free(pathname);
return ret;
}
}
} else {
/* Empty path. */
- pathname = "";
+ pathname = strdup("");
}
/* Prep channel message structure */
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
0, 0,
- monitor);
+ monitor, 0);
health_code_update();
health_code_update();
error:
+ free(pathname);
return ret;
}
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.
*/
DBG("Sending session stream to kernel consumer");
- if (session->metadata_stream_fd >= 0) {
+ if (session->metadata_stream_fd >= 0 && session->metadata) {
ret = kernel_consumer_add_metadata(sock, session, monitor);
if (ret < 0) {
goto error;
}
-
- /* Flag that at least the metadata has been sent to the consumer. */
- session->consumer_fds_sent = 1;
}
/* Send channel and streams of it */
if (ret < 0) {
goto error;
}
+ if (monitor) {
+ /*
+ * Inform the relay that all the streams for the
+ * channel were sent.
+ */
+ ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+ if (ret < 0) {
+ goto error;
+ }
+ }
}
DBG("Kernel consumer FDs of metadata and channel streams sent");
+ session->consumer_fds_sent = 1;
return 0;
error:
assert(channel);
assert(socket);
- assert(socket->fd);
DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = channel->fd;
assert(metadata);
assert(socket);
- assert(socket->fd);
DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+ memset(&msg, 0, sizeof(msg));
msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
msg.u.destroy_channel.key = metadata->fd;