X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c3f564dce4709b3493c154cbd0a5faf1df3d62b4;hp=37c7354ef0827f22fd23a1f53c2a71464fb18c1a;hb=9ad42ec1800b074488873ec43d91c73ce9c9dfcf;hpb=d7b63d8cb065085e8518e380923283884f4f31ea

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 37c7354ef..c3f564dce 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -1630,6 +1630,10 @@ static void *thread_dispatch_ust_registration(void *data)
 
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG_DISPATCH);
 
+	if (testpoint(sessiond_thread_app_reg_dispatch)) {
+		goto error_testpoint;
+	}
+
 	health_code_update();
 
 	CDS_INIT_LIST_HEAD(&wait_queue.head);
@@ -1834,6 +1838,7 @@ error:
 		free(wait_node);
 	}
 
+error_testpoint:
 	DBG("Dispatch thread dying");
 	if (err) {
 		health_error();
@@ -2022,11 +2027,6 @@ static void *thread_registration_apps(void *data)
 
 exit:
 error:
-	if (err) {
-		health_error();
-		ERR("Health error occurred in %s", __func__);
-	}
-
 	/* Notify that the registration thread is gone */
 	notify_ust_apps(0);
 
@@ -2051,6 +2051,10 @@ error_listen:
 error_create_poll:
 error_testpoint:
 	DBG("UST Registration thread cleanup complete");
+	if (err) {
+		health_error();
+		ERR("Health error occurred in %s", __func__);
+	}
 	health_unregister(health_sessiond);
 
 	return NULL;