Remove inappropriate \n from easy-ust sample

[lttng-ust.git] / liblttng-ust-comm / lttng-ust-comm.c

diff --git a/liblttng-ust-comm/lttng-ust-comm.c b/liblttng-ust-comm/lttng-ust-comm.c
index 21f48ed00bf00cfa10351df04950817bb968ea25..2332dbf1a383d2b2b6e1500fb604039e53ab72e9 100644 (file)
--- a/liblttng-ust-comm/lttng-ust-comm.c
+++ b/liblttng-ust-comm/lttng-ust-comm.c
@@ -251,7 +251,7 @@ ssize_t ustcomm_recv_unix_sock(int sock, void *buf, size_t len)
        do {
                ret = recvmsg(sock, &msg, 0);
        } while (ret < 0 && errno == EINTR);
-       if (ret < 0) {
+       if (ret < 0 && errno != EPIPE) {
                perror("recvmsg");
        }
 
@@ -284,8 +284,10 @@ ssize_t ustcomm_send_unix_sock(int sock, void *buf, size_t len)
         * by ignoring SIGPIPE, but we don't have this luxury on the
         * libust side.
         */
-       ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
-       if (ret < 0) {
+       do {
+               ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
+       } while (ret < 0 && errno == EINTR);
+       if (ret < 0 && errno != EPIPE) {
                perror("sendmsg");
        }
 
@@ -301,10 +303,9 @@ int ustcomm_close_unix_sock(int sock)
 {
        int ret;
 
-       /* Shutdown receptions and transmissions */
-       ret = shutdown(sock, SHUT_RDWR);
+       ret = close(sock);
        if (ret < 0) {
-               perror("shutdown");
+               perror("close");
        }
 
        return ret;
@@ -348,8 +349,10 @@ ssize_t ustcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd,
        msg.msg_iov = iov;
        msg.msg_iovlen = 1;
 
-       ret = sendmsg(sock, &msg, 0);
-       if (ret < 0) {
+       do {
+               ret = sendmsg(sock, &msg, MSG_NOSIGNAL);
+       } while (ret < 0 && errno == EINTR);
+       if (ret < 0 && errno != EPIPE) {
                perror("sendmsg");
        }
 
@@ -468,7 +471,9 @@ int ustcomm_recv_fd(int sock)
                ret = recvmsg(sock, &msg, 0);
        } while (ret < 0 && errno == EINTR);
        if (ret < 0) {
-               perror("recvmsg");
+               if (errno != EPIPE) {
+                       perror("recvmsg");
+               }
                goto end;
        }
        if (ret != sizeof(data_fd)) {