X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fkernel-consumer.c;h=25f0e47998eebb85e753d249df947bbb02d1c72f;hb=fb5f35b688fa31b21b25f9a6a831df3e5aa243ed;hp=33cbbed3e679a42df9db3951b0a2040b681b481c;hpb=c30aaa51f34105a7f20b9ceb39866001843db6e6;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 33cbbed3e..25f0e4799 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;
@@ -51,11 +52,15 @@ int kernel_consumer_add_channel(int sock, struct ltt_kernel_channel *channel)
 			channel->channel->name,
 			channel->stream_count);
 
+	health_code_update(&health_thread_kernel);
+
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 error:
 	return ret;
 }
@@ -63,7 +68,8 @@ 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];
@@ -74,6 +80,7 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 	/* Safety net */
 	assert(session);
 	assert(session->consumer);
+	assert(sock);
 
 	DBG("Sending metadata %d to kernel consumer", session->metadata_stream_fd);
 
@@ -120,11 +127,15 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			"metadata",
 			1);
 
+	health_code_update(&health_thread_kernel);
+
 	ret = consumer_send_channel(sock, &lkm);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 	/* Prep stream message structure */
 	consumer_init_stream_comm_msg(&lkm,
 			LTTNG_CONSUMER_ADD_STREAM,
@@ -138,7 +149,10 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 			consumer->net_seq_index,
 			1, /* Metadata flag set */
 			"metadata",
-			pathname);
+			pathname,
+			session->id);
+
+	health_code_update(&health_thread_kernel);
 
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm,
@@ -147,6 +161,8 @@ int kernel_consumer_add_metadata(int sock, struct ltt_kernel_session *session)
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 error:
 	return ret;
 }
@@ -154,8 +170,9 @@ 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];
@@ -167,6 +184,7 @@ int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *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);
@@ -207,7 +225,10 @@ int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
 			consumer->net_seq_index,
 			0, /* Metadata flag unset */
 			stream->name,
-			pathname);
+			pathname,
+			session->id);
+
+	health_code_update(&health_thread_kernel);
 
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
@@ -215,6 +236,8 @@ int kernel_consumer_add_stream(int sock, struct ltt_kernel_channel *channel,
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 error:
 	return ret;
 }
@@ -222,7 +245,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;
@@ -232,6 +255,7 @@ 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) {
@@ -267,7 +291,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;
@@ -275,6 +300,7 @@ 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) {