X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=922e81b594817b365fcffa3d8f3f1ed2adfb750f;hb=a9ade9664f81a422c669f7a043c10479bb82ff42;hp=dfe608cba27e29259ff29ca953edf8e6596d5cf6;hpb=1d76b9222464f9e10128ae867cd56a9317da5d65;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index dfe608cba..922e81b59 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -839,8 +839,15 @@ static void *thread_manage_kernel(void *data)
 		lttng_poll_reset(&events);
 
 		/* Poll infinite value of time */
+	restart:
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
+			/*
+			 * Restart interrupted system call.
+			 */
+			if (errno == EINTR) {
+				goto restart;
+			}
 			goto error;
 		} else if (ret == 0) {
 			/* Should not happen since timeout is infinite */
@@ -930,8 +937,15 @@ static void *thread_manage_consumer(void *data)
 	nb_fd = LTTNG_POLL_GETNB(&events);
 
 	/* Inifinite blocking call, waiting for transmission */
+restart:
 	ret = lttng_poll_wait(&events, -1);
 	if (ret < 0) {
+		/*
+		 * Restart interrupted system call.
+		 */
+		if (errno == EINTR) {
+			goto restart;
+		}
 		goto error;
 	}
 
@@ -1001,8 +1015,15 @@ static void *thread_manage_consumer(void *data)
 	nb_fd = LTTNG_POLL_GETNB(&events);
 
 	/* Inifinite blocking call, waiting for transmission */
+restart_poll:
 	ret = lttng_poll_wait(&events, -1);
 	if (ret < 0) {
+		/*
+		 * Restart interrupted system call.
+		 */
+		if (errno == EINTR) {
+			goto restart_poll;
+		}
 		goto error;
 	}
 
@@ -1085,8 +1106,15 @@ static void *thread_manage_apps(void *data)
 		DBG("Apps thread polling on %d fds", nb_fd);
 
 		/* Inifinite blocking call, waiting for transmission */
+	restart:
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
+			/*
+			 * Restart interrupted system call.
+			 */
+			if (errno == EINTR) {
+				goto restart;
+			}
 			goto error;
 		}
 
@@ -1146,8 +1174,10 @@ static void *thread_manage_apps(void *data)
 						/*
 						 * We just need here to monitor the close of the UST
 						 * socket and poll set monitor those by default.
+						 * Listen on POLLIN (even if we never expect any
+						 * data) to ensure that hangup wakes us.
 						 */
-						ret = lttng_poll_add(&events, ust_cmd.sock, 0);
+						ret = lttng_poll_add(&events, ust_cmd.sock, LPOLLIN);
 						if (ret < 0) {
 							goto error;
 						}
@@ -1304,8 +1334,15 @@ static void *thread_registration_apps(void *data)
 		nb_fd = LTTNG_POLL_GETNB(&events);
 
 		/* Inifinite blocking call, waiting for transmission */
+	restart:
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
+			/*
+			 * Restart interrupted system call.
+			 */
+			if (errno == EINTR) {
+				goto restart;
+			}
 			goto error;
 		}
 
@@ -3607,8 +3644,15 @@ static void *thread_manage_clients(void *data)
 		nb_fd = LTTNG_POLL_GETNB(&events);
 
 		/* Inifinite blocking call, waiting for transmission */
+	restart:
 		ret = lttng_poll_wait(&events, -1);
 		if (ret < 0) {
+			/*
+			 * Restart interrupted system call.
+			 */
+			if (errno == EINTR) {
+				goto restart;
+			}
 			goto error;
 		}