X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=tests%2Fregression%2Ftools%2Fhealth%2Fhealth_exit.c;h=8a99326444e3687bed27ec997159f3dd1e76043a;hb=b1c46f877df8d424d82125f32e2dabd651280f3b;hp=8d1d05c5311dfa069bc66557a0448bb31ef10d72;hpb=7f2a80589c0b04627eaa351a9debff202836f930;p=lttng-tools.git

diff --git a/tests/regression/tools/health/health_exit.c b/tests/regression/tools/health/health_exit.c
index 8d1d05c53..8a9932644 100644
--- a/tests/regression/tools/health/health_exit.c
+++ b/tests/regression/tools/health/health_exit.c
@@ -1,5 +1,6 @@
 /*
  * Copyright (C) 2012 - Christian Babeux <christian.babeux@efficios.com>
+ * Copyright (C) 2014 - Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License, version 2 only, as
@@ -24,6 +25,7 @@
  * Check if the specified environment variable is set.
  * Return 1 if set, otherwise 0.
  */
+static
 int check_env_var(const char *env)
 {
 	if (env) {
@@ -36,9 +38,11 @@ int check_env_var(const char *env)
 	return 0;
 }
 
-int __testpoint_thread_manage_clients(void)
+/* Session daemon */
+
+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();
@@ -48,20 +52,103 @@ int __testpoint_thread_manage_clients(void)
 	return 0;
 }
 
-int __testpoint_thread_registration_apps(void)
+int __testpoint_sessiond_thread_registration_apps(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_REG_APPS_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_sessiond_thread_manage_apps(void)
 {
-	const char *var = "LTTNG_THREAD_REG_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_sessiond_thread_manage_kernel(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_KERNEL_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_sessiond_thread_manage_consumer(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_MANAGE_CONSUMER_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_sessiond_thread_ht_cleanup(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_HT_CLEANUP_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_sessiond_thread_app_manage_notify(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_APP_MANAGE_NOTIFY_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_sessiond_thread_app_reg_dispatch(void)
+{
+	const char *var = "LTTNG_SESSIOND_THREAD_APP_REG_DISPATCH_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+/* Consumer daemon */
+
+int __testpoint_consumerd_thread_channel(void)
+{
+	const char *var = "LTTNG_CONSUMERD_THREAD_CHANNEL_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
 		pthread_exit(NULL);
 	}
 
 	return 0;
 }
 
-int __testpoint_thread_manage_apps(void)
+int __testpoint_consumerd_thread_metadata(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_APPS_EXIT";
+	const char *var = "LTTNG_CONSUMERD_THREAD_METADATA_EXIT";
 
 	if (check_env_var(var)) {
 		rcu_unregister_thread();
@@ -71,20 +158,103 @@ int __testpoint_thread_manage_apps(void)
 	return 0;
 }
 
-int __testpoint_thread_manage_kernel(void)
+int __testpoint_consumerd_thread_data(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_KERNEL_EXIT";
+	const char *var = "LTTNG_CONSUMERD_THREAD_DATA_EXIT";
 
 	if (check_env_var(var)) {
+		rcu_unregister_thread();
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_consumerd_thread_sessiond(void)
+{
+	const char *var = "LTTNG_CONSUMERD_THREAD_SESSIOND_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_consumerd_thread_metadata_timer(void)
+{
+	const char *var = "LTTNG_CONSUMERD_THREAD_METADATA_TIMER_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+/* Relay daemon */
+
+int __testpoint_relayd_thread_dispatcher(void)
+{
+	const char *var = "LTTNG_RELAYD_THREAD_DISPATCHER_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_relayd_thread_worker(void)
+{
+	const char *var = "LTTNG_RELAYD_THREAD_WORKER_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_relayd_thread_listener(void)
+{
+	const char *var = "LTTNG_RELAYD_THREAD_LISTENER_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_relayd_thread_live_dispatcher(void)
+{
+	const char *var = "LTTNG_RELAYD_THREAD_LIVE_DISPATCHER_EXIT";
+
+	if (check_env_var(var)) {
+		pthread_exit(NULL);
+	}
+
+	return 0;
+}
+
+int __testpoint_relayd_thread_live_worker(void)
+{
+	const char *var = "LTTNG_RELAYD_THREAD_LIVE_WORKER_EXIT";
+
+	if (check_env_var(var)) {
+		rcu_unregister_thread();
 		pthread_exit(NULL);
 	}
 
 	return 0;
 }
 
-int __testpoint_thread_manage_consumer(void)
+int __testpoint_relayd_thread_live_listener(void)
 {
-	const char *var = "LTTNG_THREAD_MANAGE_CONSUMER_EXIT";
+	const char *var = "LTTNG_RELAYD_THREAD_LIVE_LISTENER_EXIT";
 
 	if (check_env_var(var)) {
 		pthread_exit(NULL);