Remove assert from kconsumerd (multi-fd handling is ok)

Signed-off-by: Mathieu Desnoyers <mathieu.desnoyers@efficios.com>

diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c
index 1d69a4c463faffc1fa764141e287f725a625c535..f60888a83fc8f5ebc5758155770876973216c01e 100644 (file)
--- a/liblttkconsumerd/liblttkconsumerd.c
+++ b/liblttkconsumerd/liblttkconsumerd.c
@@ -597,12 +597,8 @@ static int kconsumerd_consumerd_recv_fd(int sfd,
        nb_fd = size / sizeof(struct lttcomm_kconsumerd_msg);
 
        /*
-        * Note: only supporting receiving one FD at a time for now.
-        * This code needs fixing if we wish to receive more (a single
-        * receive for the whole fd batch rather than one per fd).
+        * nb_fd is the number of fds we receive. One fd per recvmsg.
         */
-       assert(nb_fd == 1);
-
        for (i = 0; i < nb_fd; i++) {
                struct msghdr msg = { 0 };
 

diff --git a/liblttsessiondcomm/liblttsessiondcomm.c b/liblttsessiondcomm/liblttsessiondcomm.c
index 253e63545addf17710baeecc679d37fa05d11aae..9313a34c5d57eba26190e0b07075dea2d7c1ab1b 100644 (file)
--- a/liblttsessiondcomm/liblttsessiondcomm.c
+++ b/liblttsessiondcomm/liblttsessiondcomm.c
@@ -299,8 +299,8 @@ ssize_t lttcomm_send_fds_unix_sock(int sock, void *buf, int *fds, size_t nb_fd,
        char tmp[CMSG_SPACE(sizeof_fds)];
 
        /*
-        * Note: the consumerd receiver only supports receiving one FD at a
-        * time for now.
+        * Note: the consumerd receiver only supports receiving one FD per
+        * message.
         */
        assert(nb_fd == 1);