From: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
Date: Tue, 6 Mar 2012 23:10:59 +0000 (-0500)
Subject: Merge branch 'master' into dev
X-Git-Tag: v2.1.0-rc1~97^2
X-Git-Url: http://git.liburcu.org/?a=commitdiff_plain;h=49365f4b706194cafe75d8b759554bf9de743c1d;hp=e3feda7db3de3530e7c9c511536c36cccf317013;p=lttng-ust.git

Merge branch 'master' into dev
---

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 7e55cff5..9baa4dc5 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -255,7 +255,9 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
-	ret = recvmsg(sock, &msg, 0);
+	do {
+		ret = recvmsg(sock, &msg, 0);
+	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
 		perror("recvmsg");
 	}
@@ -469,7 +471,10 @@ int ustcomm_recv_fd(int sock)
 	msg.msg_control = recv_fd;
 	msg.msg_controllen = sizeof(recv_fd);
 
-	if ((ret = recvmsg(sock, &msg, 0)) < 0) {
+	do {
+		ret = recvmsg(sock, &msg, 0);
+	} while (ret < 0 && errno == EINTR);
+	if (ret < 0) {
 		perror("recvmsg");
 		goto end;
 	}