X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=c05be0a91533797a088670af6b6ec52c00637154;hb=62c131b788b59fedd0fea20b4204e91f53b7de06;hp=891abe9b8f88803e925c711ef8593bcb1f021283;hpb=db95e42c8705602f673f280af61962dd4f8faa36;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 891abe9b8..c05be0a91 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -801,13 +801,13 @@ static void *thread_manage_kernel(void *data)
 	 */
 	lttng_poll_init(&events);
 
-	if (testpoint(thread_manage_kernel)) {
+	if (testpoint(sessiond_thread_manage_kernel)) {
 		goto error_testpoint;
 	}
 
 	health_code_update();
 
-	if (testpoint(thread_manage_kernel_before_loop)) {
+	if (testpoint(sessiond_thread_manage_kernel_before_loop)) {
 		goto error_testpoint;
 	}
 
@@ -987,7 +987,7 @@ static void *thread_manage_consumer(void *data)
 restart:
 	health_poll_entry();
 
-	if (testpoint(thread_manage_consumer)) {
+	if (testpoint(sessiond_thread_manage_consumer)) {
 		goto error;
 	}
 
@@ -1260,7 +1260,7 @@ static void *thread_manage_apps(void *data)
 
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_MANAGE);
 
-	if (testpoint(thread_manage_apps)) {
+	if (testpoint(sessiond_thread_manage_apps)) {
 		goto error_testpoint;
 	}
 
@@ -1276,7 +1276,7 @@ static void *thread_manage_apps(void *data)
 		goto error;
 	}
 
-	if (testpoint(thread_manage_apps_before_loop)) {
+	if (testpoint(sessiond_thread_manage_apps_before_loop)) {
 		goto error;
 	}
 
@@ -1762,7 +1762,7 @@ static void *thread_registration_apps(void *data)
 
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_APP_REG);
 
-	if (testpoint(thread_registration_apps)) {
+	if (testpoint(sessiond_thread_registration_apps)) {
 		goto error_testpoint;
 	}
 
@@ -3693,10 +3693,6 @@ static void *thread_manage_clients(void *data)
 
 	health_register(health_sessiond, HEALTH_SESSIOND_TYPE_CMD);
 
-	if (testpoint(thread_manage_clients)) {
-		goto error_testpoint;
-	}
-
 	health_code_update();
 
 	ret = lttcomm_listen_unix_sock(client_sock);
@@ -3732,7 +3728,12 @@ static void *thread_manage_clients(void *data)
 		kill(child_ppid, SIGUSR1);
 	}
 
-	if (testpoint(thread_manage_clients_before_loop)) {
+	/* This testpoint is after we signal readiness to the parent. */
+	if (testpoint(sessiond_thread_manage_clients)) {
+		goto error;
+	}
+
+	if (testpoint(sessiond_thread_manage_clients_before_loop)) {
 		goto error;
 	}
 
@@ -3907,7 +3908,6 @@ error:
 
 error_listen:
 error_create_poll:
-error_testpoint:
 	unlink(client_unix_sock_path);
 	if (client_sock >= 0) {
 		ret = close(client_sock);