X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=liblttng-ust-comm%2Flttng-ust-comm.c;h=21f48ed00bf00cfa10351df04950817bb968ea25;hb=7e3cfcbe9ccfef8837c42efcf5332035814415fc;hp=8b2e775a779d3ff966c4d241d3e18c6532c189d6;hpb=15f672f9b1c28f6810de3b3b3ab089619c8bcb45;p=lttng-ust.git

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 8b2e775a..21f48ed0 100644
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -30,7 +30,7 @@
 #include <assert.h>
 #include <errno.h>
 
-#include <lttng/ust-comm.h>
+#include <ust-comm.h>
 
 /*
  * Human readable error message.
@@ -237,16 +237,20 @@ int ustcomm_listen_unix_sock(int sock)
  */
 ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
 
+	memset(&msg, 0, sizeof(msg));
+
 	iov[0].iov_base = buf;
 	iov[0].iov_len = 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");
 	}
@@ -262,10 +266,12 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
  */
 ssize_t ustcomm_send_unix_sock(int sock, void *buf, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct iovec iov[1];
 	ssize_t ret = -1;
 
+	memset(&msg, 0, sizeof(msg));
+
 	iov[0].iov_base = buf;
 	iov[0].iov_len = len;
 	msg.msg_iov = iov;
@@ -311,13 +317,15 @@ int ustcomm_close_unix_sock(int sock)
  */
 ssize_t ustcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd, size_t len)
 {
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	struct cmsghdr *cmptr;
 	struct iovec iov[1];
 	ssize_t ret = -1;
 	unsigned int sizeof_fds = nb_fd * sizeof(int);
 	char tmp[CMSG_SPACE(sizeof_fds)];
 
+	memset(&msg, 0, sizeof(msg));
+
 	/*
 	 * Note: the consumerd receiver only supports receiving one FD per
 	 * message.
@@ -355,16 +363,15 @@ int ustcomm_send_app_msg(int sock, struct ustcomm_ust_msg *lum)
 	len = ustcomm_send_unix_sock(sock, lum, sizeof(*lum));
 	switch (len) {
 	case sizeof(*lum):
-		printf("message successfully sent\n");
 		break;
 	case -1:
 		if (errno == ECONNRESET) {
-			printf("remote end closed connection\n");
+			fprintf(stderr, "remote end closed connection\n");
 			return 0;
 		}
 		return -1;
 	default:
-		printf("incorrect message size: %zd\n", len);
+		fprintf(stderr, "incorrect message size: %zd\n", len);
 		return -1;
 	}
 	return 0;
@@ -379,33 +386,35 @@ int ustcomm_recv_app_reply(int sock, struct ustcomm_ust_reply *lur,
 	len = ustcomm_recv_unix_sock(sock, lur, sizeof(*lur));
 	switch (len) {
 	case 0:	/* orderly shutdown */
-		printf("Application has performed an orderly shutdown\n");
 		return -EINVAL;
 	case sizeof(*lur):
-		printf("result message received\n");
 		if (lur->handle != expected_handle) {
-			printf("Unexpected result message handle\n");
+			fprintf(stderr, "Unexpected result message handle\n");
 			return -EINVAL;
 		}
 
 		if (lur->cmd != expected_cmd) {
-			printf("Unexpected result message command\n");
+			fprintf(stderr, "Unexpected result message command\n");
 			return -EINVAL;
 		}
 		if (lur->ret_code != USTCOMM_OK) {
-			printf("remote operation failed with code %d.\n",
-				lur->ret_code);
+			/*
+			 * Some errors are normal.. we should put this
+			 * in a debug level message...
+			 * fprintf(stderr, "remote operation failed with code %d.\n",
+			 *	lur->ret_code);
+			 */
 			return lur->ret_code;
 		}
 		return 0;
 	case -1:
 		if (errno == ECONNRESET) {
-			printf("remote end closed connection\n");
+			fprintf(stderr, "remote end closed connection\n");
 			return -EINVAL;
 		}
 		return -1;
 	default:
-		printf("incorrect message size: %zd\n", len);
+		fprintf(stderr, "incorrect message size: %zd\n", len);
 		return len > 0 ? -1 : len;
 	}
 }
@@ -438,13 +447,15 @@ int ustcomm_recv_fd(int sock)
 	int data_fd;
 	struct cmsghdr *cmsg;
 	char recv_fd[CMSG_SPACE(sizeof(int))];
-	struct msghdr msg = { 0 };
+	struct msghdr msg;
 	union {
 		unsigned char vc[4];
 		int vi;
 	} tmp;
 	int i;
 
+	memset(&msg, 0, sizeof(msg));
+
 	/* Prepare to receive the structures */
 	iov[0].iov_base = &data_fd;
 	iov[0].iov_len = sizeof(data_fd);
@@ -453,23 +464,25 @@ int ustcomm_recv_fd(int sock)
 	msg.msg_control = recv_fd;
 	msg.msg_controllen = sizeof(recv_fd);
 
-	printf("Waiting to receive fd\n");
-	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;
 	}
 	if (ret != sizeof(data_fd)) {
-		printf("Received %d bytes, expected %ld", ret, sizeof(data_fd));
+		fprintf(stderr, "Received %d bytes, expected %zd", ret, sizeof(data_fd));
 		goto end;
 	}
 	cmsg = CMSG_FIRSTHDR(&msg);
 	if (!cmsg) {
-		printf("Invalid control message header\n");
+		fprintf(stderr, "Invalid control message header\n");
 		ret = -1;
 		goto end;
 	}
 	if (cmsg->cmsg_level != SOL_SOCKET || cmsg->cmsg_type != SCM_RIGHTS) {
-		printf("Didn't received any fd\n");
+		fprintf(stderr, "Didn't received any fd\n");
 		ret = -1;
 		goto end;
 	}
@@ -477,7 +490,10 @@ int ustcomm_recv_fd(int sock)
 	for (i = 0; i < sizeof(int); i++)
 		tmp.vc[i] = CMSG_DATA(cmsg)[i];
 	ret = tmp.vi;
-	printf("received fd %d\n", ret);
+	/*
+	 * Useful for fd leak debug.
+	 * fprintf(stderr, "received fd %d\n", ret);
+	 */
 end:
 	return ret;
 }