X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=fc52d759b2130b8f1bdd2e122f24c1990f9b85d2;hb=35df275583d85652cb5132adb9416e32175524e7;hp=022bbc6d1dc5b293974166f0a92bd04818ba29e2;hpb=edb8b045f1abe76804200921e7b2eb42ec66b5e4;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 022bbc6d1..fc52d759b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -228,6 +228,11 @@ struct health_state health_thread_app_manage;
 struct health_state health_thread_app_reg;
 struct health_state health_thread_kernel;
 
+/*
+ * Socket timeout for receiving and sending in seconds.
+ */
+static int app_socket_timeout;
+
 static
 void setup_consumerd_path(void)
 {
@@ -1205,6 +1210,12 @@ static void *thread_manage_apps(void *data)
 							goto error;
 						}
 
+						/* Set socket timeout for both receiving and ending */
+						(void) lttcomm_setsockopt_rcv_timeout(ust_cmd.sock,
+								app_socket_timeout);
+						(void) lttcomm_setsockopt_snd_timeout(ust_cmd.sock,
+								app_socket_timeout);
+
 						DBG("Apps with sock %d added to poll set",
 								ust_cmd.sock);
 					}
@@ -3100,7 +3111,7 @@ static void *thread_manage_clients(void *data)
 
 	ret = lttcomm_listen_unix_sock(client_sock);
 	if (ret < 0) {
-		goto error;
+		goto error_listen;
 	}
 
 	/*
@@ -3109,7 +3120,7 @@ static void *thread_manage_clients(void *data)
 	 */
 	ret = create_thread_poll_set(&events, 2);
 	if (ret < 0) {
-		goto error;
+		goto error_create_poll;
 	}
 
 	/* Add the application registration socket */
@@ -3288,13 +3299,18 @@ static void *thread_manage_clients(void *data)
 
 exit:
 error:
-	if (err) {
-		health_error(&health_thread_cmd);
-		ERR("Health error occurred in %s", __func__);
+	if (sock >= 0) {
+		ret = close(sock);
+		if (ret) {
+			PERROR("close");
+		}
 	}
-	health_exit(&health_thread_cmd);
 
-	DBG("Client thread dying");
+	lttng_poll_clean(&events);
+	clean_command_ctx(&cmd_ctx);
+
+error_listen:
+error_create_poll:
 	unlink(client_unix_sock_path);
 	if (client_sock >= 0) {
 		ret = close(client_sock);
@@ -3302,15 +3318,15 @@ error:
 			PERROR("close");
 		}
 	}
-	if (sock >= 0) {
-		ret = close(sock);
-		if (ret) {
-			PERROR("close");
-		}
+
+	if (err) {
+		health_error(&health_thread_cmd);
+		ERR("Health error occurred in %s", __func__);
 	}
 
-	lttng_poll_clean(&events);
-	clean_command_ctx(&cmd_ctx);
+	health_exit(&health_thread_cmd);
+
+	DBG("Client thread dying");
 
 	rcu_unregister_thread();
 	return NULL;
@@ -3790,7 +3806,7 @@ int main(int argc, char **argv)
 {
 	int ret = 0;
 	void *status;
-	const char *home_path;
+	const char *home_path, *env_app_timeout;
 
 	init_kernel_workarounds();
 
@@ -4070,6 +4086,14 @@ int main(int argc, char **argv)
 	health_init(&ustconsumer64_data.health);
 	health_poll_update(&ustconsumer64_data.health);
 
+	/* Check for the application socket timeout env variable. */
+	env_app_timeout = getenv(DEFAULT_APP_SOCKET_TIMEOUT_ENV);
+	if (env_app_timeout) {
+		app_socket_timeout = atoi(env_app_timeout);
+	} else {
+		app_socket_timeout = DEFAULT_APP_SOCKET_RW_TIMEOUT;
+	}
+
 	/* Create thread to manage the client socket */
 	ret = pthread_create(&health_thread, NULL,
 			thread_manage_health, (void *) NULL);