X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=160c19f598329ec03c6d82023ad55f09bc38db03;hb=fc58be13f62e691645dd75d56ce26d2e121b13e0;hp=067652b811def6d6a65a4604c88b8b1f5cd82873;hpb=e99f9447b5be2deee54dde16b404a12b3fcd88ee;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 067652b81..160c19f59 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <unistd.h>
+#include <inttypes.h>
 
 #include <common/common.h>
 #include <common/defaults.h>
@@ -44,8 +45,10 @@ static char *create_channel_path(struct consumer_output *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);
+		ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s%s",
+				consumer->dst.session_root_path,
+				consumer->chunk_path,
+				consumer->subdir);
 		if (ret < 0) {
 			PERROR("snprintf kernel channel path");
 			goto error;
@@ -66,7 +69,9 @@ static char *create_channel_path(struct consumer_output *consumer,
 		}
 		DBG3("Kernel local consumer tracefile path: %s", pathname);
 	} else {
-		ret = snprintf(tmp_path, sizeof(tmp_path), "%s", consumer->subdir);
+		ret = snprintf(tmp_path, sizeof(tmp_path), "%s%s",
+				consumer->dst.net.base_dir,
+				consumer->subdir);
 		if (ret < 0) {
 			PERROR("snprintf kernel metadata path");
 			goto error;
@@ -129,7 +134,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_CHANNEL,
-			channel->fd,
+			channel->key,
 			ksession->id,
 			pathname,
 			ksession->uid,
@@ -160,7 +165,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	status = notification_thread_command_add_channel(
 			notification_thread_handle, session->name,
 			ksession->uid, ksession->gid,
-			channel->channel->name, channel->fd,
+			channel->channel->name, channel->key,
 			LTTNG_DOMAIN_KERNEL,
 			channel->channel->attr.subbuf_size * channel->channel->attr.num_subbuf);
 	rcu_read_unlock();
@@ -168,6 +173,9 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 		ret = -1;
 		goto error;
 	}
+
+	channel->published_to_notification_thread = true;
+
 error:
 	free(pathname);
 	return ret;
@@ -175,6 +183,8 @@ error:
 
 /*
  * Sending metadata to the consumer with command ADD_CHANNEL and ADD_STREAM.
+ *
+ * The consumer socket lock must be held by the caller.
  */
 int kernel_consumer_add_metadata(struct consumer_socket *sock,
 		struct ltt_kernel_session *session, unsigned int monitor)
@@ -208,7 +218,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	/* Prep channel message structure */
 	consumer_init_channel_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_CHANNEL,
-			session->metadata->fd,
+			session->metadata->key,
 			session->id,
 			pathname,
 			session->uid,
@@ -233,7 +243,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	/* Prep stream message structure */
 	consumer_init_stream_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_STREAM,
-			session->metadata->fd,
+			session->metadata->key,
 			session->metadata_stream_fd,
 			0); /* CPU: 0 for metadata. */
 
@@ -279,7 +289,7 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
 	/* Prep stream consumer message */
 	consumer_init_stream_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_STREAM,
-			channel->fd,
+			channel->key,
 			stream->fd,
 			stream->cpu);
 
@@ -333,6 +343,8 @@ error:
 
 /*
  * Send all stream fds of kernel channel to the consumer.
+ *
+ * The consumer socket lock must be held by the caller.
  */
 int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 		struct ltt_kernel_channel *channel, struct ltt_kernel_session *session,
@@ -385,6 +397,8 @@ error:
 
 /*
  * Send all stream fds of the kernel session to the consumer.
+ *
+ * The consumer socket lock must be held by the caller.
  */
 int kernel_consumer_send_session(struct consumer_socket *sock,
 		struct ltt_kernel_session *session)
@@ -429,7 +443,7 @@ int kernel_consumer_send_session(struct consumer_socket *sock,
 			 * Inform the relay that all the streams for the
 			 * channel were sent.
 			 */
-			ret = kernel_consumer_streams_sent(sock, session, chan->fd);
+			ret = kernel_consumer_streams_sent(sock, session, chan->key);
 			if (ret < 0) {
 				goto error;
 			}
@@ -454,11 +468,11 @@ int kernel_consumer_destroy_channel(struct consumer_socket *socket,
 	assert(channel);
 	assert(socket);
 
-	DBG("Sending kernel consumer destroy channel key %d", channel->fd);
+	DBG("Sending kernel consumer destroy channel key %" PRIu64, channel->key);
 
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-	msg.u.destroy_channel.key = channel->fd;
+	msg.u.destroy_channel.key = channel->key;
 
 	pthread_mutex_lock(socket->lock);
 	health_code_update();
@@ -483,11 +497,11 @@ int kernel_consumer_destroy_metadata(struct consumer_socket *socket,
 	assert(metadata);
 	assert(socket);
 
-	DBG("Sending kernel consumer destroy channel key %d", metadata->fd);
+	DBG("Sending kernel consumer destroy channel key %" PRIu64, metadata->key);
 
 	memset(&msg, 0, sizeof(msg));
 	msg.cmd_type = LTTNG_CONSUMER_DESTROY_CHANNEL;
-	msg.u.destroy_channel.key = metadata->fd;
+	msg.u.destroy_channel.key = metadata->key;
 
 	pthread_mutex_lock(socket->lock);
 	health_code_update();