From ca03de585e016f441dfe373420545a6fb047531a Mon Sep 17 00:00:00 2001
From: David Goulet <dgoulet@efficios.com>
Date: Thu, 13 Dec 2012 16:35:44 -0500
Subject: [PATCH] Fix: Add missing health code update for consumer command

Signed-off-by: David Goulet <dgoulet@efficios.com>
---
 src/bin/lttng-sessiond/kernel-consumer.c | 16 ++++++++++++++++
 src/bin/lttng-sessiond/ust-consumer.c    | 20 ++++++++++++++++++++
 2 files changed, 36 insertions(+)

diff --git a/src/bin/lttng-sessiond/kernel-consumer.c b/src/bin/lttng-sessiond/kernel-consumer.c
index 2a9bf9983..25f0e4799 100644
--- a/src/bin/lttng-sessiond/kernel-consumer.c
+++ b/src/bin/lttng-sessiond/kernel-consumer.c
@@ -52,11 +52,15 @@ int kernel_consumer_add_channel(struct consumer_socket *sock,
 			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;
 }
@@ -123,11 +127,15 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			"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,
@@ -144,6 +152,8 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 			pathname,
 			session->id);
 
+	health_code_update(&health_thread_kernel);
+
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm,
 			&session->metadata_stream_fd, 1);
@@ -151,6 +161,8 @@ int kernel_consumer_add_metadata(struct consumer_socket *sock,
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 error:
 	return ret;
 }
@@ -216,12 +228,16 @@ int kernel_consumer_add_stream(struct consumer_socket *sock,
 			pathname,
 			session->id);
 
+	health_code_update(&health_thread_kernel);
+
 	/* Send stream and file descriptor */
 	ret = consumer_send_stream(sock, consumer, &lkm, &stream->fd, 1);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_kernel);
+
 error:
 	return ret;
 }
diff --git a/src/bin/lttng-sessiond/ust-consumer.c b/src/bin/lttng-sessiond/ust-consumer.c
index c1af765c9..e804f4b5a 100644
--- a/src/bin/lttng-sessiond/ust-consumer.c
+++ b/src/bin/lttng-sessiond/ust-consumer.c
@@ -57,17 +57,23 @@ static int send_channel(struct consumer_socket *sock,
 			uchan->name,
 			uchan->streams.count);
 
+	health_code_update(&health_thread_cmd);
+
 	ret = consumer_send_channel(sock, &msg);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	fd = uchan->obj->shm_fd;
 	ret = consumer_send_fds(sock, &fd, 1);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 error:
 	return ret;
 }
@@ -108,6 +114,8 @@ static int send_channel_stream(struct consumer_socket *sock,
 			pathname,
 			usess->id);
 
+	health_code_update(&health_thread_cmd);
+
 	/* Send stream and file descriptor */
 	fds[0] = stream->obj->shm_fd;
 	fds[1] = stream->obj->wait_fd;
@@ -116,6 +124,8 @@ static int send_channel_stream(struct consumer_socket *sock,
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 error:
 	return ret;
 }
@@ -220,11 +230,15 @@ static int send_metadata(struct consumer_socket *sock,
 			"metadata",
 			1);
 
+	health_code_update(&health_thread_cmd);
+
 	ret = consumer_send_channel(sock, &msg);
 	if (ret < 0) {
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	/* Sending metadata shared memory fd */
 	fd = usess->metadata->obj->shm_fd;
 	ret = consumer_send_fds(sock, &fd, 1);
@@ -232,6 +246,8 @@ static int send_metadata(struct consumer_socket *sock,
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 	/* Get correct path name destination */
 	if (consumer->type == CONSUMER_DST_LOCAL) {
 		/* Set application path to the destination path */
@@ -277,6 +293,8 @@ static int send_metadata(struct consumer_socket *sock,
 			pathname,
 			usess->id);
 
+	health_code_update(&health_thread_cmd);
+
 	/* Send stream and file descriptor */
 	fds[0] = usess->metadata->stream_obj->shm_fd;
 	fds[1] = usess->metadata->stream_obj->wait_fd;
@@ -285,6 +303,8 @@ static int send_metadata(struct consumer_socket *sock,
 		goto error;
 	}
 
+	health_code_update(&health_thread_cmd);
+
 error:
 	return ret;
 }
-- 
2.34.1