X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng-sessiond%2Fmain.c;h=477a9413b71692d8630572dc8ab6de49b5534bad;hp=6e548f3c10bf8185c13ac8156f1b5c54fe0ff4ce;hb=f921c78f991c899c741252949662cc2f589d8741;hpb=23f5f35da2bfb8e5162419bf84627714f920da2c

diff --git a/src/bin/lttng-sessiond/main.c b/src/bin/lttng-sessiond/main.c
index 6e548f3c1..477a9413b 100644
--- a/src/bin/lttng-sessiond/main.c
+++ b/src/bin/lttng-sessiond/main.c
@@ -772,7 +772,13 @@ static void *thread_manage_kernel(void *data)
 
 			/* Check for data on kernel pipe */
 			if (pollfd == kernel_poll_pipe[0] && (revents & LPOLLIN)) {
-				ret = read(kernel_poll_pipe[0], &tmp, 1);
+				do {
+					ret = read(kernel_poll_pipe[0], &tmp, 1);
+				} while (ret < 0 && errno == EINTR);
+				/*
+				 * Ret value is useless here, if this pipe gets any actions an
+				 * update is required anyway.
+				 */
 				update_poll_flag = 1;
 				continue;
 			} else {
@@ -1166,7 +1172,9 @@ static void *thread_manage_apps(void *data)
 					goto error;
 				} else if (revents & LPOLLIN) {
 					/* Empty pipe */
-					ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					do {
+						ret = read(apps_cmd_pipe[0], &ust_cmd, sizeof(ust_cmd));
+					} while (ret < 0 && errno == EINTR);
 					if (ret < 0 || ret < sizeof(ust_cmd)) {
 						PERROR("read apps cmd pipe");
 						goto error;