X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=src%2Fcommon%2Fsessiond-comm%2Fsessiond-comm.c;h=5f086141dd7b2af44954c9ab93edf0078fdcddd2;hb=b024d072031acc6eec7e083de606fbce11aab882;hp=96615f4389adad78ac3804a9cd9c1b1dba7a763a;hpb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;p=lttng-tools.git

diff --git a/src/common/sessiond-comm/sessiond-comm.c b/src/common/sessiond-comm/sessiond-comm.c
index 96615f438..5f086141d 100644
--- a/src/common/sessiond-comm/sessiond-comm.c
+++ b/src/common/sessiond-comm/sessiond-comm.c
@@ -101,6 +101,10 @@ 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) ] = "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",
+
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_COMMAND_SOCK_READY) ] = "consumerd command socket ready",
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_SUCCESS_RECV_FD) ] = "consumerd success on receiving fds",
 	[ LTTCOMM_ERR_INDEX(CONSUMERD_ERROR_RECV_FD) ] = "consumerd error on receiving fds",
@@ -116,7 +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_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_INVALID) ] = "Invalid parameter",
 };
 
 /*
@@ -264,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");
 	}
@@ -296,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");
 		}
 	}
@@ -367,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");
 		}
 	}
@@ -402,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;
@@ -486,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");
 		}
 	}
@@ -529,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;