X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=bb4a11934f2c42c9a00ae2a1475844969789b4ac;hb=d14d33bf091e72b23b1f90ea18a0a01bed098b76;hp=53d8d7ca539b836758d14a71d57bbb80b5ed0e36;hpb=80e327fa80045f6b470ac76963fc4b5d396a80a9;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 53d8d7ca5..bb4a11934 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -2,18 +2,18 @@
  * Copyright (C) 2011 - David Goulet <david.goulet@polymtl.ca>
  *                      Mathieu Desnoyers <mathieu.desnoyers@efficios.com>
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms of the GNU General Public License as published by the Free
- * Software Foundation; only version 2 of the License.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License, version 2 only,
+ * as published by the Free Software Foundation.
  * 
  * This program is distributed in the hope that it will be useful, but WITHOUT
  * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
  * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
  * more details.
  * 
- * You should have received a copy of the GNU General Public License along with
- * this program; if not, write to the Free Software Foundation, Inc., 59 Temple
- * Place - Suite 330, Boston, MA  02111-1307, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  */
 
 #define _GNU_SOURCE
@@ -101,7 +101,7 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_EVENT_NOT_FOUND)] = "UST event not found",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CONTEXT_EXIST)] = "UST context already exist",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_UST_CONTEXT_INVAL)] = "UST invalid context",
-	[ LTTCOMM_ERR_INDEX(LTTCOMM_NEED_ROOT_SESSIOND) ] = "A root lttng-sessiond needs to be running, and client user part of the \"tracing\" group, to interact with kernel tracing",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_NEED_ROOT_SESSIOND) ] = "Tracing the kernel requires a root lttng-sessiond daemon and \"tracing\" group user membership",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_TRACE_ALREADY_STARTED) ] = "Tracing already started",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_TRACE_ALREADY_STOPPED) ] = "Tracing already stopped",
 
@@ -120,6 +120,7 @@ static const char *lttcomm_readable_code[] = {
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SPLICE_ENOMEM) ] = "consumerd splice ENOMEM",
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SPLICE_ESPIPE) ] = "consumerd splice ESPIPE",
 	[ LTTCOMM_ERR_INDEX(LTTCOMM_NO_EVENT) ] = "Event not found",
+	[ LTTCOMM_ERR_INDEX(LTTCOMM_INVALID) ] = "Invalid parameter",
 };
 
 /*
@@ -267,7 +268,9 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 	msg.msg_iov = iov;
 	msg.msg_iovlen = 1;
 
-	ret = recvmsg(sock, &msg, MSG_WAITALL);
+	do {
+		ret = recvmsg(sock, &msg, MSG_WAITALL);
+	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
 		PERROR("recvmsg");
 	}
@@ -299,7 +302,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}
@@ -370,7 +373,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}
@@ -405,7 +408,9 @@ ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 	msg.msg_control = recv_fd;
 	msg.msg_controllen = sizeof(recv_fd);
 
-	ret = recvmsg(sock, &msg, 0);
+	do {
+		ret = recvmsg(sock, &msg, 0);
+	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
 		PERROR("recvmsg fds");
 		goto end;
@@ -489,7 +494,7 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 		 * Only warn about EPIPE when quiet mode is deactivated.
 		 * We consider EPIPE as expected.
 		 */
-		if (errno != EPIPE || !opt_quiet) {
+		if (errno != EPIPE || !lttng_opt_quiet) {
 			PERROR("sendmsg");
 		}
 	}
@@ -532,7 +537,9 @@ ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
 	msg.msg_controllen = sizeof(anc_buf);
 #endif /* __linux__ */
 
-	ret = recvmsg(sock, &msg, 0);
+	do {
+		ret = recvmsg(sock, &msg, 0);
+	} while (ret < 0 && errno == EINTR);
 	if (ret < 0) {
 		PERROR("recvmsg fds");
 		goto end;