* Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
-#define _GNU_SOURCE
+#define _LGPL_SOURCE
#include <stdio.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/stat.h>
#include <unistd.h>
#include <common/common.h>
#include <common/defaults.h>
+#include <common/compat/string.h>
#include "consumer.h"
-#include "health.h"
+#include "health-sessiond.h"
#include "kernel-consumer.h"
-/*
- * Sending a single channel to the consumer with command ADD_CHANNEL.
- */
-int kernel_consumer_add_channel(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_session *session)
+static char *create_channel_path(struct consumer_output *consumer,
+ uid_t uid, gid_t gid)
{
int ret;
char tmp_path[PATH_MAX];
- const char *pathname;
- struct lttcomm_consumer_msg lkm;
- struct consumer_output *consumer;
-
- /* Safety net */
- assert(channel);
- assert(session);
- assert(session->consumer);
+ char *pathname = NULL;
- consumer = session->consumer;
-
- DBG("Kernel consumer adding channel %s to kernel consumer",
- channel->channel->name);
+ assert(consumer);
/* Get the right path name destination */
if (consumer->type == CONSUMER_DST_LOCAL) {
ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
consumer->dst.trace_path, consumer->subdir);
if (ret < 0) {
- PERROR("snprintf metadata path");
+ PERROR("snprintf kernel channel path");
+ goto error;
+ }
+ pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+ if (!pathname) {
+ PERROR("lttng_strndup");
goto error;
}
- pathname = tmp_path;
/* Create directory */
- ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
- session->uid, session->gid);
+ ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
if (ret < 0) {
- if (ret != -EEXIST) {
+ if (errno != EEXIST) {
ERR("Trace directory creation error");
goto error;
}
} else {
ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
if (ret < 0) {
- PERROR("snprintf metadata path");
+ PERROR("snprintf kernel metadata path");
+ goto error;
+ }
+ pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
+ if (!pathname) {
+ PERROR("lttng_strndup");
goto error;
}
- pathname = tmp_path;
DBG3("Kernel network consumer subdir path: %s", pathname);
}
+ return pathname;
+
+error:
+ free(pathname);
+ return NULL;
+}
+
+/*
+ * Sending a single channel to the consumer with command ADD_CHANNEL.
+ */
+int kernel_consumer_add_channel(struct consumer_socket *sock,
+ struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
+ unsigned int monitor)
+{
+ int ret;
+ char *pathname;
+ struct lttcomm_consumer_msg lkm;
+ struct consumer_output *consumer;
+
+ /* Safety net */
+ assert(channel);
+ assert(session);
+ assert(session->consumer);
+
+ consumer = session->consumer;
+
+ DBG("Kernel consumer adding channel %s to kernel consumer",
+ channel->channel->name);
+
+ if (monitor) {
+ pathname = create_channel_path(consumer, session->uid, session->gid);
+ } else {
+ /* Empty path. */
+ pathname = strdup("");
+ }
+ if (!pathname) {
+ ret = -1;
+ goto error;
+ }
+
/* Prep channel message structure */
consumer_init_channel_comm_msg(&lkm,
LTTNG_CONSUMER_ADD_CHANNEL,
channel->channel->attr.output,
CONSUMER_CHANNEL_TYPE_DATA,
channel->channel->attr.tracefile_size,
- channel->channel->attr.tracefile_count);
+ channel->channel->attr.tracefile_count,
+ monitor,
+ channel->channel->attr.live_timer_interval);
health_code_update();
health_code_update();
error:
+ free(pathname);
return ret;
}
* Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
*/
int kernel_consumer_add_metadata(struct consumer_socket *sock,
- struct ltt_kernel_session *session)
+ struct ltt_kernel_session *session, unsigned int monitor)
{
int ret;
- char tmp_path[PATH_MAX];
- const char *pathname;
+ char *pathname;
struct lttcomm_consumer_msg lkm;
struct consumer_output *consumer;
/* Get consumer output pointer */
consumer = session->consumer;
- /* Get the right path name destination */
- if (consumer->type == CONSUMER_DST_LOCAL) {
- /* Set application path to the destination path */
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
- consumer->dst.trace_path, consumer->subdir);
- if (ret < 0) {
- PERROR("snprintf metadata path");
- goto error;
- }
- pathname = tmp_path;
-
- /* Create directory */
- ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG,
- session->uid, session->gid);
- if (ret < 0) {
- if (ret != -EEXIST) {
- ERR("Trace directory creation error");
- goto error;
- }
- }
- DBG3("Kernel local consumer tracefile path: %s", pathname);
+ if (monitor) {
+ pathname = create_channel_path(consumer, session->uid, session->gid);
} else {
- ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
- if (ret < 0) {
- PERROR("snprintf metadata path");
- goto error;
- }
- pathname = tmp_path;
- DBG3("Kernel network consumer subdir path: %s", pathname);
+ /* Empty path. */
+ pathname = strdup("");
+ }
+ if (!pathname) {
+ ret = -1;
+ goto error;
}
/* Prep channel message structure */
1,
DEFAULT_KERNEL_CHANNEL_OUTPUT,
CONSUMER_CHANNEL_TYPE_METADATA,
- 0, 0);
+ 0, 0,
+ monitor, 0);
health_code_update();
health_code_update();
error:
+ free(pathname);
return ret;
}
*/
int kernel_consumer_add_stream(struct consumer_socket *sock,
struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
- struct ltt_kernel_session *session)
+ struct ltt_kernel_session *session, unsigned int monitor)
{
int ret;
struct lttcomm_consumer_msg lkm;
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 kernel_consumer_send_channel_stream(struct consumer_socket *sock,
- struct ltt_kernel_channel *channel, struct ltt_kernel_session *session)
+ struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
+ unsigned int monitor)
{
int ret;
struct ltt_kernel_stream *stream;
DBG("Sending streams of channel %s to kernel consumer",
channel->channel->name);
- ret = kernel_consumer_add_channel(sock, channel, session);
+ ret = kernel_consumer_add_channel(sock, channel, session, monitor);
if (ret < 0) {
goto error;
}
}
/* Add stream on the kernel consumer side. */
- ret = kernel_consumer_add_stream(sock, channel, stream, session);
+ ret = kernel_consumer_add_stream(sock, channel, stream, session,
+ monitor);
if (ret < 0) {
goto error;
}
int kernel_consumer_send_session(struct consumer_socket *sock,
struct ltt_kernel_session *session)
{
- int ret;
+ int ret, monitor = 0;
struct ltt_kernel_channel *chan;
/* Safety net */
goto error;
}
+ /* Don't monitor the streams on the consumer if in flight recorder. */
+ if (session->output_traces) {
+ monitor = 1;
+ }
+
DBG("Sending session stream to kernel consumer");
- if (session->metadata_stream_fd >= 0) {
- ret = kernel_consumer_add_metadata(sock, session);
+ 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 */
cds_list_for_each_entry(chan, &session->channel_list.head, list) {
- ret = kernel_consumer_send_channel_stream(sock, chan, session);
+ ret = kernel_consumer_send_channel_stream(sock, chan, session,
+ monitor);
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:
return ret;
}
+
+int kernel_consumer_destroy_channel(struct consumer_socket *socket,
+ struct ltt_kernel_channel *channel)
+{
+ int ret;
+ struct lttcomm_consumer_msg msg;
+
+ assert(channel);
+ assert(socket);
+
+ 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;
+
+ pthread_mutex_lock(socket->lock);
+ health_code_update();
+
+ ret = consumer_send_msg(socket, &msg);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ health_code_update();
+ pthread_mutex_unlock(socket->lock);
+ return ret;
+}
+
+int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
+ struct ltt_kernel_metadata *metadata)
+{
+ int ret;
+ struct lttcomm_consumer_msg msg;
+
+ assert(metadata);
+ assert(socket);
+
+ 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;
+
+ pthread_mutex_lock(socket->lock);
+ health_code_update();
+
+ ret = consumer_send_msg(socket, &msg);
+ if (ret < 0) {
+ goto error;
+ }
+
+error:
+ health_code_update();
+ pthread_mutex_unlock(socket->lock);
+ return ret;
+}
projects / lttng-tools.git / blobdiff