X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Fhealth_exit.c;h=55cff4611726124c990a264a2cbc3d2cd5ff2742;hp=8e414053e9d961867acc2b075ec8f1df6342af9f;hb=e547b070c5a28571d67efb3349814036f73ab38a;hpb=5d2e1e66a968d9e555f9b8b00d0589ebfaf3de32

diff --git a/tests/regression/tools/health/health_exit.c b/tests/regression/tools/health/health_exit.c
index 8e414053e..55cff4611 100644
--- a/tests/regression/tools/health/health_exit.c
+++ b/tests/regression/tools/health/health_exit.c
@@ -18,6 +18,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <pthread.h>
+#include <urcu.h>
 
 /*
  * Check if the specified environment variable is set.
@@ -35,20 +36,21 @@ int check_env_var(const char *env)
 	return 0;
 }
 
-int __testpoint_thread_manage_clients(void)
+int __testpoint_sessiond_thread_manage_clients(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_CLIENTS_EXIT";
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_CLIENTS_EXIT";
 
 	if (check_env_var(var)) {
+		rcu_unregister_thread();
 		pthread_exit(NULL);
 	}
 
 	return 0;
 }
 
-int __testpoint_thread_registration_apps(void)
+int __testpoint_sessiond_thread_registration_apps(void)
 {
-	const char *var = "LTTNG_THREAD_REG_APPS_EXIT";
+	const char *var = "LTTNG_SESSIOND_THREAD_REG_APPS_EXIT";
 
 	if (check_env_var(var)) {
 		pthread_exit(NULL);
@@ -57,20 +59,21 @@ int __testpoint_thread_registration_apps(void)
 	return 0;
 }
 
-int __testpoint_thread_manage_apps(void)
+int __testpoint_sessiond_thread_manage_apps(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_APPS_EXIT";
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_APPS_EXIT";
 
 	if (check_env_var(var)) {
+		rcu_unregister_thread();
 		pthread_exit(NULL);
 	}
 
 	return 0;
 }
 
-int __testpoint_thread_manage_kernel(void)
+int __testpoint_sessiond_thread_manage_kernel(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_KERNEL_EXIT";
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_KERNEL_EXIT";
 
 	if (check_env_var(var)) {
 		pthread_exit(NULL);
@@ -79,9 +82,9 @@ int __testpoint_thread_manage_kernel(void)
 	return 0;
 }
 
-int __testpoint_thread_manage_consumer(void)
+int __testpoint_sessiond_thread_manage_consumer(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_CONSUMER_EXIT";
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_CONSUMER_EXIT";
 
 	if (check_env_var(var)) {
 		pthread_exit(NULL);