X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=d999928feb8a0f06bfe24857fc3182f56c4f903f;hp=a63593d18030c0c1f88c34f4f331c6de2fdf2f47;hb=927ca06aed61ff6dd3f64ae71854f2d7f9acebe5;hpb=3fd15a7429ca3f5307a783e264155ae0218511ec

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a63593d18..d999928fe 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -705,6 +705,8 @@ static void *thread_manage_kernel(void *data)
 
 	DBG("[thread] Thread manage kernel started");
 
+	health_register(HEALTH_TYPE_KERNEL);
+
 	/*
 	 * This first step of the while is to clean this structure which could free
 	 * non NULL pointers so zero it before the loop.
@@ -828,7 +830,7 @@ error_testpoint:
 		WARN("Kernel thread died unexpectedly. "
 				"Kernel tracing can continue but CPU hotplug is disabled.");
 	}
-	health_exit(&health_thread_kernel);
+	health_unregister();
 	DBG("Kernel thread dying");
 	return NULL;
 }
@@ -869,6 +871,8 @@ static void *thread_manage_consumer(void *data)
 
 	DBG("[thread] Manage consumer started");
 
+	health_register(HEALTH_TYPE_CONSUMER);
+
 	/*
 	 * Since the consumer thread can be spawned at any moment in time, we init
 	 * the health to a poll status (1, which is a valid health over time).
@@ -1102,7 +1106,7 @@ error_poll:
 		health_error(&consumer_data->health);
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_exit(&consumer_data->health);
+	health_unregister();
 	DBG("consumer thread cleanup completed");
 
 	return NULL;
@@ -1123,6 +1127,8 @@ static void *thread_manage_apps(void *data)
 	rcu_register_thread();
 	rcu_thread_online();
 
+	health_register(HEALTH_TYPE_APP_MANAGE);
+
 	if (testpoint(thread_manage_apps)) {
 		goto error_testpoint;
 	}
@@ -1294,7 +1300,7 @@ error_testpoint:
 		health_error(&health_thread_app_manage);
 		ERR("Health error occurred in %s", __func__);
 	}
-	health_exit(&health_thread_app_manage);
+	health_unregister();
 	DBG("Application communication apps thread cleanup complete");
 	rcu_thread_offline();
 	rcu_unregister_thread();
@@ -1391,6 +1397,8 @@ static void *thread_registration_apps(void *data)
 
 	DBG("[thread] Manage application registration started");
 
+	health_register(HEALTH_TYPE_APP_REG);
+
 	if (testpoint(thread_registration_apps)) {
 		goto error_testpoint;
 	}
@@ -1573,7 +1581,7 @@ error_listen:
 error_create_poll:
 error_testpoint:
 	DBG("UST Registration thread cleanup complete");
-	health_exit(&health_thread_app_reg);
+	health_unregister();
 
 	return NULL;
 }
@@ -1948,9 +1956,7 @@ static int check_consumer_health(void)
 {
 	int ret;
 
-	ret = health_check_state(&kconsumer_data.health) &&
-		health_check_state(&ustconsumer32_data.health) &&
-		health_check_state(&ustconsumer64_data.health);
+	ret = health_check_state(HEALTH_TYPE_CONSUMER);
 
 	DBG3("Health consumer check %d", ret);
 
@@ -3068,26 +3074,26 @@ restart:
 
 		switch (msg.component) {
 		case LTTNG_HEALTH_CMD:
-			reply.ret_code = health_check_state(&health_thread_cmd);
+			reply.ret_code = health_check_state(HEALTH_TYPE_CMD);
 			break;
 		case LTTNG_HEALTH_APP_MANAGE:
-			reply.ret_code = health_check_state(&health_thread_app_manage);
+			reply.ret_code = health_check_state(HEALTH_TYPE_APP_MANAGE);
 			break;
 		case LTTNG_HEALTH_APP_REG:
-			reply.ret_code = health_check_state(&health_thread_app_reg);
+			reply.ret_code = health_check_state(HEALTH_TYPE_APP_REG);
 			break;
 		case LTTNG_HEALTH_KERNEL:
-			reply.ret_code = health_check_state(&health_thread_kernel);
+			reply.ret_code = health_check_state(HEALTH_TYPE_KERNEL);
 			break;
 		case LTTNG_HEALTH_CONSUMER:
 			reply.ret_code = check_consumer_health();
 			break;
 		case LTTNG_HEALTH_ALL:
 			reply.ret_code =
-				health_check_state(&health_thread_app_manage) &&
-				health_check_state(&health_thread_app_reg) &&
-				health_check_state(&health_thread_cmd) &&
-				health_check_state(&health_thread_kernel) &&
+				health_check_state(HEALTH_TYPE_APP_MANAGE) &&
+				health_check_state(HEALTH_TYPE_APP_REG) &&
+				health_check_state(HEALTH_TYPE_CMD) &&
+				health_check_state(HEALTH_TYPE_KERNEL) &&
 				check_consumer_health();
 			break;
 		default:
@@ -3162,6 +3168,8 @@ static void *thread_manage_clients(void *data)
 
 	rcu_register_thread();
 
+	health_register(HEALTH_TYPE_CMD);
+
 	if (testpoint(thread_manage_clients)) {
 		goto error_testpoint;
 	}
@@ -3386,7 +3394,7 @@ error_testpoint:
 		ERR("Health error occurred in %s", __func__);
 	}
 
-	health_exit(&health_thread_cmd);
+	health_unregister();
 
 	DBG("Client thread dying");
 
@@ -4167,26 +4175,6 @@ int main(int argc, char **argv)
 
 	cmd_init();
 
-	/* Init all health thread counters. */
-	health_init(&health_thread_cmd);
-	health_init(&health_thread_kernel);
-	health_init(&health_thread_app_manage);
-	health_init(&health_thread_app_reg);
-
-	/*
-	 * Init health counters of the consumer thread. We do a quick hack here to
-	 * the state of the consumer health is fine even if the thread is not
-	 * started. Once the thread starts, the health state is updated with a poll
-	 * value to set a health code path. This is simply to ease our life and has
-	 * no cost what so ever.
-	 */
-	health_init(&kconsumer_data.health);
-	health_poll_update(&kconsumer_data.health);
-	health_init(&ustconsumer32_data.health);
-	health_poll_update(&ustconsumer32_data.health);
-	health_init(&ustconsumer64_data.health);
-	health_poll_update(&ustconsumer64_data.health);
-
 	/* Check for the application socket timeout env variable. */
 	env_app_timeout = getenv(DEFAULT_APP_SOCKET_TIMEOUT_ENV);
 	if (env_app_timeout) {