X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=21654957aac170fc0f17c5b86496ecfdc7e94eae;hb=97bc1426a470ac30ed29357e5c68a256a79fef0e;hp=4d9b22de2d4d93e3def0cd43597c61c8b33db87b;hpb=226e8f15071226f3d7911fd213000f8959c4bc76;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 4d9b22de2..21654957a 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -284,6 +284,38 @@ unsigned int jul_tcp_port = DEFAULT_JUL_TCP_PORT;
 
 const char * const config_section_name = "sessiond";
 
+/*
+ * Whether sessiond is ready for commands/health check requests.
+ * NR_LTTNG_SESSIOND_READY must match the number of calls to
+ * lttng_sessiond_notify_ready().
+ */
+#define NR_LTTNG_SESSIOND_READY		2
+int lttng_sessiond_ready = NR_LTTNG_SESSIOND_READY;
+
+/* Notify parents that we are ready for cmd and health check */
+static
+void lttng_sessiond_notify_ready(void)
+{
+	if (uatomic_sub_return(&lttng_sessiond_ready, 1) == 0) {
+		/*
+		 * Notify parent pid that we are ready to accept command
+		 * for client side.  This ppid is the one from the
+		 * external process that spawned us.
+		 */
+		if (opt_sig_parent) {
+			kill(ppid, SIGUSR1);
+		}
+
+		/*
+		 * Notify the parent of the fork() process that we are
+		 * ready.
+		 */
+		if (opt_daemon) {
+			kill(child_ppid, SIGUSR1);
+		}
+	}
+}
+
 static
 void setup_consumerd_path(void)
 {
@@ -866,13 +898,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;
 	}
 
@@ -1052,7 +1084,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;
 	}
 
@@ -1325,7 +1357,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;
 	}
 
@@ -1341,7 +1373,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;
 	}
 
@@ -1827,7 +1859,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;
 	}
 
@@ -3630,6 +3662,8 @@ static void *thread_manage_health(void *data)
 		goto error;
 	}
 
+	lttng_sessiond_notify_ready();
+
 	while (1) {
 		DBG("Health check ready");
 
@@ -3758,10 +3792,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);
@@ -3784,20 +3814,14 @@ static void *thread_manage_clients(void *data)
 		goto error;
 	}
 
-	/*
-	 * Notify parent pid that we are ready to accept command for client side.
-	 * This ppid is the one from the external process that spawned us.
-	 */
-	if (opt_sig_parent) {
-		kill(ppid, SIGUSR1);
-	}
+	lttng_sessiond_notify_ready();
 
-	/* Notify the parent of the fork() process that we are ready. */
-	if (opt_daemon) {
-		kill(child_ppid, SIGUSR1);
+	/* This testpoint is after we signal readiness to the parent. */
+	if (testpoint(sessiond_thread_manage_clients)) {
+		goto error;
 	}
 
-	if (testpoint(thread_manage_clients_before_loop)) {
+	if (testpoint(sessiond_thread_manage_clients_before_loop)) {
 		goto error;
 	}
 
@@ -3972,7 +3996,6 @@ error:
 
 error_listen:
 error_create_poll:
-error_testpoint:
 	unlink(client_unix_sock_path);
 	if (client_sock >= 0) {
 		ret = close(client_sock);