X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=2a9bf9983d937223e5131ed5c0d374599c052000;hb=fc5e05b76ff7c5696c51dfa571c1a45dd402dee5;hp=4c037a9eb25b426edb4677701349d560bc06d549;hpb=37278a1e7efe00011260569fa90909601e8c5184;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 4c037a9eb..2a9bf9983 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -31,7 +31,8 @@
 /*
  * Sending a single channel to the consumer with command ADD_CHANNEL.
  */
-int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
+int kernel_consumer_add_channel(struct consumer_socket *sock,
+		struct ltt_kernel_channel *channel)
 {
 	int ret;
 	struct lttcomm_consumer_msg lkm;
@@ -48,7 +49,8 @@ int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
 			channel->fd,
 			channel->channel->attr.subbuf_size,
 			0, /* Kernel */
-			channel->channel->name);
+			channel->channel->name,
+			channel->stream_count);
 
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
@@ -62,27 +64,54 @@ error:
 /*
  * Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
  */
-int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
+int kernel_consumer_add_metadata(struct consumer_socket *sock,
+		struct ltt_kernel_session *session)
 {
 	int ret;
+	char tmp_path[PATH_MAX];
 	const char *pathname;
 	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *output;
+	struct consumer_output *consumer;
 
 	/* Safety net */
 	assert(session);
 	assert(session->consumer);
+	assert(sock);
 
 	DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
 
 	/* Get consumer output pointer */
-	output = session->consumer;
+	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;
 
-	/* Get correct path name destination */
-	if (output->type == CONSUMER_DST_LOCAL) {
-		pathname = output->dst.trace_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 {
-		pathname = output->subdir;
+		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);
 	}
 
 	/* Prep channel message structure */
@@ -91,7 +120,8 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			session->metadata->fd,
 			session->metadata->conf->attr.subbuf_size,
 			0, /* for kernel */
-			"metadata");
+			"metadata",
+			1);
 
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
@@ -108,13 +138,14 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			0, /* Kernel */
 			session->uid,
 			session->gid,
-			output->net_seq_index,
+			consumer->net_seq_index,
 			1, /* Metadata flag set */
 			"metadata",
-			pathname);
+			pathname,
+			session->id);
 
 	/* Send stream and file descriptor */
-	ret = consumer_send_stream(sock, output, &lkm,
+	ret = consumer_send_stream(sock, consumer, &lkm,
 			&session->metadata_stream_fd, 1);
 	if (ret < 0) {
 		goto error;
@@ -127,32 +158,47 @@ error:
 /*
  * Sending a single stream to the consumer with command ADD_STREAM.
  */
-int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
-		struct ltt_kernel_stream *stream, struct ltt_kernel_session *session)
+int kernel_consumer_add_stream(struct consumer_socket *sock,
+		struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
+		struct ltt_kernel_session *session)
 {
 	int ret;
+	char tmp_path[PATH_MAX];
 	const char *pathname;
 	struct lttcomm_consumer_msg lkm;
-	struct consumer_output *output;
+	struct consumer_output *consumer;
 
 	assert(channel);
 	assert(stream);
 	assert(session);
 	assert(session->consumer);
+	assert(sock);
 
 	DBG("Sending stream %d of channel %s to kernel consumer",
 			stream->fd, channel->channel->name);
 
 	/* Get consumer output pointer */
-	output = session->consumer;
+	consumer = session->consumer;
 
-	/* Get correct path name destination */
-	if (output->type == CONSUMER_DST_LOCAL) {
-		pathname = output->dst.trace_path;
-		DBG3("Consumer is local to %s", pathname);
+	/* 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 {
-		pathname = output->subdir;
-		DBG3("Consumer is network to subdir %s", pathname);
+		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 */
@@ -164,13 +210,14 @@ int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
 			0, /* Kernel */
 			session->uid,
 			session->gid,
-			output->net_seq_index,
+			consumer->net_seq_index,
 			0, /* Metadata flag unset */
 			stream->name,
-			pathname);
+			pathname,
+			session->id);
 
 	/* Send stream and file descriptor */
-	ret = consumer_send_stream(sock, output, &lkm, &stream->fd, 1);
+	ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
 	if (ret < 0) {
 		goto error;
 	}
@@ -182,7 +229,7 @@ error:
 /*
  * Send all stream fds of kernel channel to the consumer.
  */
-int kernel_consumer_send_channel_stream(int sock,
+int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session)
 {
 	int ret;
@@ -192,10 +239,11 @@ int kernel_consumer_send_channel_stream(int sock,
 	assert(channel);
 	assert(session);
 	assert(session->consumer);
+	assert(sock);
 
 	/* Bail out if consumer is disabled */
 	if (!session->consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		goto error;
 	}
 
@@ -227,7 +275,8 @@ error:
 /*
  * Send all stream fds of the kernel session to the consumer.
  */
-int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session)
+int kernel_consumer_send_session(struct consumer_socket *sock,
+		struct ltt_kernel_session *session)
 {
 	int ret;
 	struct ltt_kernel_channel *chan;
@@ -235,10 +284,11 @@ int kernel_consumer_send_session(int sock, struct ltt_kernel_session *session)
 	/* Safety net */
 	assert(session);
 	assert(session->consumer);
+	assert(sock);
 
 	/* Bail out if consumer is disabled */
 	if (!session->consumer->enabled) {
-		ret = LTTCOMM_OK;
+		ret = LTTNG_OK;
 		goto error;
 	}