X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=05e447754bb2156a77b6ce3d8dc1555f84973864;hp=20a7efb402a2314a9fcc006dbf4c84439e5a099f;hb=92816cc33a1add3c8276839bd6335e17423577dd;hpb=366a9222abc182bf77de1b806256aa9a9dc8832a

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 20a7efb40..05e447754 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -52,6 +52,13 @@ static char *create_channel_path(struct consumer_output *consumer,
 		if (ret < 0) {
 			PERROR("snprintf kernel channel path");
 			goto error;
+		} else if (ret >= sizeof(tmp_path)) {
+			ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s%s\"",
+					sizeof(tmp_path), ret,
+					consumer->dst.session_root_path,
+					consumer->chunk_path,
+					consumer->subdir);
+			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
@@ -69,10 +76,18 @@ 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;
+		} else if (ret >= sizeof(tmp_path)) {
+			ERR("Kernel channel path exceeds the maximal allowed length of of %zu bytes (%i bytes required) with path \"%s%s\"",
+					sizeof(tmp_path), ret,
+					consumer->dst.net.base_dir,
+					consumer->subdir);
+			goto error;
 		}
 		pathname = lttng_strndup(tmp_path, sizeof(tmp_path));
 		if (!pathname) {
@@ -130,8 +145,7 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	}
 
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
+	consumer_init_add_channel_comm_msg(&lkm,
 			channel->key,
 			ksession->id,
 			pathname,
@@ -159,6 +173,8 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 	rcu_read_lock();
 	session = session_find_by_id(ksession->id);
 	assert(session);
+	assert(pthread_mutex_trylock(&session->lock));
+	assert(session_trylock_list());
 
 	status = notification_thread_command_add_channel(
 			notification_thread_handle, session->name,
@@ -185,25 +201,30 @@ error:
  * 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)
+		struct ltt_kernel_session *ksession, unsigned int monitor)
 {
 	int ret;
 	char *pathname;
 	struct lttcomm_consumer_msg lkm;
 	struct consumer_output *consumer;
+	struct ltt_session *session;
+
+	rcu_read_lock();
 
 	/* Safety net */
-	assert(session);
-	assert(session->consumer);
+	assert(ksession);
+	assert(ksession->consumer);
 	assert(sock);
 
-	DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
+	DBG("Sending metadata %d to kernel consumer",
+			ksession->metadata_stream_fd);
 
 	/* Get consumer output pointer */
-	consumer = session->consumer;
+	consumer = ksession->consumer;
 
 	if (monitor) {
-		pathname = create_channel_path(consumer, session->uid, session->gid);
+		pathname = create_channel_path(consumer,
+				ksession->uid, ksession->gid);
 	} else {
 		/* Empty path. */
 		pathname = strdup("");
@@ -213,14 +234,18 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 		goto error;
 	}
 
+	session = session_find_by_id(ksession->id);
+	assert(session);
+	assert(pthread_mutex_trylock(&session->lock));
+	assert(session_trylock_list());
+
 	/* Prep channel message structure */
-	consumer_init_channel_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_CHANNEL,
-			session->metadata->fd,
-			session->id,
+	consumer_init_add_channel_comm_msg(&lkm,
+			ksession->metadata->key,
+			ksession->id,
 			pathname,
-			session->uid,
-			session->gid,
+			ksession->uid,
+			ksession->gid,
 			consumer->net_seq_index,
 			DEFAULT_METADATA_NAME,
 			1,
@@ -239,17 +264,17 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	health_code_update();
 
 	/* Prep stream message structure */
-	consumer_init_stream_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_STREAM,
-			session->metadata->fd,
-			session->metadata_stream_fd,
-			0); /* CPU: 0 for metadata. */
+	consumer_init_add_stream_comm_msg(&lkm,
+			ksession->metadata->key,
+			ksession->metadata_stream_fd,
+			0 /* CPU: 0 for metadata. */,
+			session->current_archive_id);
 
 	health_code_update();
 
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm,
-			&session->metadata_stream_fd, 1);
+			&ksession->metadata_stream_fd, 1);
 	if (ret < 0) {
 		goto error;
 	}
@@ -257,6 +282,7 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 	health_code_update();
 
 error:
+	rcu_read_unlock();
 	free(pathname);
 	return ret;
 }
@@ -264,9 +290,12 @@ error:
 /*
  * Sending a single stream to the consumer with command ADD_STREAM.
  */
+static
 int kernel_consumer_add_stream(struct consumer_socket *sock,
-		struct ltt_kernel_channel *channel, struct ltt_kernel_stream *stream,
-		struct ltt_kernel_session *session, unsigned int monitor)
+		struct ltt_kernel_channel *channel,
+		struct ltt_kernel_stream *stream,
+		struct ltt_kernel_session *session, unsigned int monitor,
+		uint64_t trace_archive_id)
 {
 	int ret;
 	struct lttcomm_consumer_msg lkm;
@@ -285,11 +314,11 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
 	consumer = session->consumer;
 
 	/* Prep stream consumer message */
-	consumer_init_stream_comm_msg(&lkm,
-			LTTNG_CONSUMER_ADD_STREAM,
+	consumer_init_add_stream_comm_msg(&lkm,
 			channel->key,
 			stream->fd,
-			stream->cpu);
+			stream->cpu,
+			trace_archive_id);
 
 	health_code_update();
 
@@ -344,21 +373,29 @@ error:
  *
  * 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,
+int kernel_consumer_send_channel_streams(struct consumer_socket *sock,
+		struct ltt_kernel_channel *channel, struct ltt_kernel_session *ksession,
 		unsigned int monitor)
 {
 	int ret = LTTNG_OK;
 	struct ltt_kernel_stream *stream;
+	struct ltt_session *session;
 
 	/* Safety net */
 	assert(channel);
-	assert(session);
-	assert(session->consumer);
+	assert(ksession);
+	assert(ksession->consumer);
 	assert(sock);
 
+	rcu_read_lock();
+
+	session = session_find_by_id(ksession->id);
+	assert(session);
+	assert(pthread_mutex_trylock(&session->lock));
+	assert(session_trylock_list());
+
 	/* Bail out if consumer is disabled */
-	if (!session->consumer->enabled) {
+	if (!ksession->consumer->enabled) {
 		ret = LTTNG_OK;
 		goto error;
 	}
@@ -367,7 +404,7 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 			channel->channel->name);
 
 	if (!channel->sent_to_consumer) {
-		ret = kernel_consumer_add_channel(sock, channel, session, monitor);
+		ret = kernel_consumer_add_channel(sock, channel, ksession, monitor);
 		if (ret < 0) {
 			goto error;
 		}
@@ -381,8 +418,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,
-				monitor);
+		ret = kernel_consumer_add_stream(sock, channel, stream,
+				ksession, monitor, session->current_archive_id);
 		if (ret < 0) {
 			goto error;
 		}
@@ -390,6 +427,7 @@ int kernel_consumer_send_channel_stream(struct consumer_socket *sock,
 	}
 
 error:
+	rcu_read_unlock();
 	return ret;
 }
 
@@ -431,7 +469,7 @@ 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_streams(sock, chan, session,
 				monitor);
 		if (ret < 0) {
 			goto error;
@@ -495,11 +533,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();