X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=bf3559a21fa021a55e5cebeb7a582b72e80b87de;hp=bdf9b4098be5edef16f3f1d9ad076637079304ec;hb=07b86b528dc279d59cdf16e6cb946c144fe773f2;hpb=840cb59cfc335e2ca44841f6fd57972ac3a623be

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index bdf9b4098..bf3559a21 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -26,31 +26,104 @@
 #include <common/defaults.h>
 
 #include "consumer.h"
+#include "health.h"
 #include "kernel-consumer.h"
 
+static char *create_channel_path(struct consumer_output *consumer,
+		uid_t uid, gid_t gid)
+{
+	int ret;
+	char tmp_path[PATH_MAX];
+	char *pathname = NULL;
+
+	assert(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 kernel channel path");
+			goto error;
+		}
+		pathname = strndup(tmp_path, sizeof(tmp_path));
+
+		/* Create directory */
+		ret = run_as_mkdir_recursive(pathname, S_IRWXU | S_IRWXG, uid, gid);
+		if (ret < 0) {
+			if (ret != -EEXIST) {
+				ERR("Trace directory creation error");
+				goto error;
+			}
+		}
+		DBG3("Kernel local consumer tracefile path: %s", pathname);
+	} else {
+		ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+		if (ret < 0) {
+			PERROR("snprintf kernel metadata path");
+			goto error;
+		}
+		pathname = strndup(tmp_path, sizeof(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_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);
+		if (!pathname) {
+			ret = -1;
+			goto error;
+		}
+	} else {
+		/* Empty path. */
+		pathname = "";
+	}
+
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_CHANNEL,
 			channel->fd,
-			channel->channel->attr.subbuf_size,
-			0, /* Kernel */
+			session->id,
+			pathname,
+			session->uid,
+			session->gid,
+			consumer->net_seq_index,
 			channel->channel->name,
-			channel->stream_count);
+			channel->stream_count,
+			channel->channel->attr.output,
+			CONSUMER_CHANNEL_TYPE_DATA,
+			channel->channel->attr.tracefile_size,
+			channel->channel->attr.tracefile_count,
+			monitor);
 
 	health_code_update();
 
@@ -69,11 +142,10 @@ error:
  * 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;
 
@@ -87,45 +159,32 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	/* 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");
+	if (monitor) {
+		pathname = create_channel_path(consumer, session->uid, session->gid);
+		if (!pathname) {
+			ret = -1;
 			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);
 	} 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 = "";
 	}
 
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_CHANNEL,
 			session->metadata->fd,
-			session->metadata->conf->attr.subbuf_size,
-			0, /* for kernel */
+			session->id,
+			pathname,
+			session->uid,
+			session->gid,
+			consumer->net_seq_index,
 			DEFAULT_METADATA_NAME,
-			1);
+			1,
+			DEFAULT_KERNEL_CHANNEL_OUTPUT,
+			CONSUMER_CHANNEL_TYPE_METADATA,
+			0, 0,
+			monitor);
 
 	health_code_update();
 
@@ -141,16 +200,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			LTTNG_CONSUMER_ADD_STREAM,
 			session->metadata->fd,
 			session->metadata_stream_fd,
-			LTTNG_CONSUMER_ACTIVE_STREAM,
-			DEFAULT_KERNEL_CHANNEL_OUTPUT,
-			0, /* Kernel */
-			session->uid,
-			session->gid,
-			consumer->net_seq_index,
-			1, /* Metadata flag set */
-			DEFAULT_METADATA_NAME,
-			pathname,
-			session->id);
+			0); /* CPU: 0 for metadata. */
 
 	health_code_update();
 
@@ -172,11 +222,9 @@ error:
  */
 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;
-	char tmp_path[PATH_MAX];
-	const char *pathname;
 	struct lttcomm_consumer_msg lkm;
 	struct consumer_output *consumer;
 
@@ -192,41 +240,12 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
 	/* 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 stream path");
-			goto error;
-		}
-		pathname = tmp_path;
-		DBG3("Kernel local consumer tracefile path: %s", pathname);
-	} else {
-		ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
-		if (ret < 0) {
-			PERROR("snprintf stream path");
-			goto error;
-		}
-		pathname = tmp_path;
-		DBG3("Kernel network consumer subdir path: %s", pathname);
-	}
-
 	/* Prep stream consumer message */
-	consumer_init_stream_comm_msg(&lkm, LTTNG_CONSUMER_ADD_STREAM,
+	consumer_init_stream_comm_msg(&lkm,
+			LTTNG_CONSUMER_ADD_STREAM,
 			channel->fd,
 			stream->fd,
-			stream->state,
-			channel->channel->attr.output,
-			0, /* Kernel */
-			session->uid,
-			session->gid,
-			consumer->net_seq_index,
-			0, /* Metadata flag unset */
-			stream->name,
-			pathname,
-			session->id);
+			stream->cpu);
 
 	health_code_update();
 
@@ -246,7 +265,8 @@ error:
  * 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;
@@ -266,7 +286,7 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 	DBG("Sending streams of channel %s to kernel consumer",
 			channel->channel->name);
 
-	ret = kernel_consumer_add_channel(sock, channel);
+	ret = kernel_consumer_add_channel(sock, channel, session, monitor);
 	if (ret < 0) {
 		goto error;
 	}
@@ -278,7 +298,8 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 		}
 
 		/* 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;
 		}
@@ -294,7 +315,7 @@ 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 */
@@ -308,10 +329,15 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 		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);
+		ret = kernel_consumer_add_metadata(sock, session, monitor);
 		if (ret < 0) {
 			goto error;
 		}
@@ -322,7 +348,8 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 
 	/* 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;
 		}
@@ -335,3 +362,61 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 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);
+	assert(socket->fd >= 0);
+
+	DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+
+	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);
+	assert(socket->fd >= 0);
+
+	DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+
+	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;
+}