Remove MSG_WAITALL on every recvmsg() socket type

[lttng-tools.git] / src / common / sessiond-comm / unix.c

diff --git a/src/common/sessiond-comm/unix.c b/src/common/sessiond-comm/unix.c
index 837d12b48e1ac9d78ed66818b76191d881e78b32..bbf030f67f6bc0cef88b956af83da132f548bd57 100644 (file)
--- a/src/common/sessiond-comm/unix.c
+++ b/src/common/sessiond-comm/unix.c
@@ -35,6 +35,7 @@
 /*
  * Connect to unix socket using the path name.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_connect_unix_sock(const char *pathname)
 {
        struct sockaddr_un sun;
@@ -76,6 +77,7 @@ error:
  * Do an accept(2) on the sock and return the new file descriptor. The socket
  * MUST be bind(2) before.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_accept_unix_sock(int sock)
 {
        int new_fd;
@@ -95,6 +97,7 @@ int lttcomm_accept_unix_sock(int sock)
  * Creates a AF_UNIX local socket using pathname bind the socket upon creation
  * and return the fd.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_create_unix_sock(const char *pathname)
 {
        struct sockaddr_un sun;
@@ -129,6 +132,7 @@ error:
 /*
  * Make the socket listen using LTTNG_SESSIOND_COMM_MAX_LISTEN.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_listen_unix_sock(int sock)
 {
        int ret;
@@ -147,11 +151,13 @@ int lttcomm_listen_unix_sock(int sock)
  *
  * Return the size of received data.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
 {
        struct msghdr msg;
        struct iovec iov[1];
        ssize_t ret = -1;
+       size_t len_last;
 
        memset(&msg, 0, sizeof(msg));
 
@@ -161,11 +167,20 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
        msg.msg_iovlen = 1;
 
        do {
-               ret = recvmsg(sock, &msg, MSG_WAITALL);
-       } while (ret < 0 && errno == EINTR);
+               len_last = iov[0].iov_len;
+               ret = recvmsg(sock, &msg, 0);
+               if (ret > 0) {
+                       iov[0].iov_base += ret;
+                       iov[0].iov_len -= ret;
+                       assert(ret <= len_last);
+               }
+       } while ((ret > 0 && ret < len_last) || (ret < 0 && errno == EINTR));
        if (ret < 0) {
                PERROR("recvmsg");
+       } else if (ret > 0) {
+               ret = len;
        }
+       /* Else ret = 0 meaning an orderly shutdown. */
 
        return ret;
 }
@@ -175,6 +190,7 @@ ssize_t lttcomm_recv_unix_sock(int sock, void *buf, size_t len)
  *
  * Return the size of sent data.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 {
        struct msghdr msg;
@@ -205,6 +221,7 @@ ssize_t lttcomm_send_unix_sock(int sock, void *buf, size_t len)
 /*
  * Shutdown cleanly a unix socket.
  */
+__attribute__((visibility("hidden")))
 int lttcomm_close_unix_sock(int sock)
 {
        int ret, closeret;
@@ -228,6 +245,7 @@ int lttcomm_close_unix_sock(int sock)
  *
  * Returns the size of data sent, or negative error value.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 {
        struct msghdr msg;
@@ -282,6 +300,7 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, int *fds, size_t nb_fd)
  * Expect at most "nb_fd" file descriptors. Returns the number of fd
  * actually received in nb_fd.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_recv_fds_unix_sock(int sock, int *fds, size_t nb_fd)
 {
        struct iovec iov[1];
@@ -347,6 +366,7 @@ end:
  *
  * Returns the size of data sent, or negative error value.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
 {
        struct msghdr msg;
@@ -402,6 +422,7 @@ ssize_t lttcomm_send_creds_unix_sock(int sock, void *buf, size_t len)
  *
  * Returns the size of received data, or negative error value.
  */
+__attribute__((visibility("hidden")))
 ssize_t lttcomm_recv_creds_unix_sock(int sock, void *buf, size_t len,
                lttng_sock_cred *creds)
 {
@@ -491,6 +512,7 @@ end:
  * Set socket option to use credentials passing.
  */
 #ifdef __linux__
+__attribute__((visibility("hidden")))
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {
        int ret, on = 1;
@@ -503,6 +525,7 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
        return ret;
 }
 #elif (defined(__FreeBSD__) || defined(__CYGWIN__))
+__attribute__((visibility("hidden")))
 int lttcomm_setsockopt_creds_unix_sock(int sock)
 {
        return 0;
@@ -510,3 +533,45 @@ int lttcomm_setsockopt_creds_unix_sock(int sock)
 #else
 #error "Please implement credential support for your OS."
 #endif /* __linux__ */
+
+/*
+ * Set socket reciving timeout.
+ */
+__attribute__((visibility("hidden")))
+int lttcomm_setsockopt_rcv_timeout(int sock, unsigned int sec)
+{
+       int ret;
+       struct timeval tv;
+
+       tv.tv_sec = sec;
+       tv.tv_usec = 0;
+
+       ret = setsockopt(sock, SOL_SOCKET, SO_RCVTIMEO, &tv, sizeof(tv));
+       if (ret < 0) {
+               PERROR("setsockopt SO_RCVTIMEO");
+               ret = -errno;
+       }
+
+       return ret;
+}
+
+/*
+ * Set socket sending timeout.
+ */
+__attribute__((visibility("hidden")))
+int lttcomm_setsockopt_snd_timeout(int sock, unsigned int sec)
+{
+       int ret;
+       struct timeval tv;
+
+       tv.tv_sec = sec;
+       tv.tv_usec = 0;
+
+       ret = setsockopt(sock, SOL_SOCKET, SO_SNDTIMEO, &tv, sizeof(tv));
+       if (ret < 0) {
+               PERROR("setsockopt SO_SNDTIMEO");
+               ret = -errno;
+       }
+
+       return ret;
+}