X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=f82f05e00b12d3521649ba6f6d2b9b0003c25c92;hb=d0d3518f0e21a83fb8e33511dad2b251178ddbd5;hp=a8156cf12ed87f3f33a90f3e3fef8cf818f72420;hpb=faf09bcfc465cdf7a5892339ee36b2dcef85b227;p=lttng-tools.git

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index a8156cf12..f82f05e00 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -831,8 +831,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 */
@@ -922,8 +929,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;
 	}
 
@@ -993,8 +1007,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;
 	}
 
@@ -1077,8 +1098,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;
 		}
 
@@ -1296,8 +1324,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;
 		}
 
@@ -3594,8 +3629,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;
 		}
 
@@ -3954,7 +3996,7 @@ static int set_permissions(char *rundir)
 	}
 
 	/* Ensure tracing group can search the run dir */
-	ret = chmod(rundir, S_IRWXU | S_IXGRP);
+	ret = chmod(rundir, S_IRWXU | S_IXGRP | S_IXOTH);
 	if (ret < 0) {
 		ERR("Unable to set permissions on %s", rundir);
 		perror("chmod");