From: Mathieu Desnoyers Date: Fri, 22 Jul 2011 18:38:17 +0000 (-0400) Subject: Remove assert from kconsumerd (multi-fd handling is ok) X-Git-Tag: v2.0-pre2~6 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=8b97b5dd9a0ab5a5b628732e17ef2f043ab3cabd;p=lttng-tools.git Remove assert from kconsumerd (multi-fd handling is ok) Signed-off-by: Mathieu Desnoyers --- diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c index 1d69a4c46..f60888a83 100644 --- 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 253e63545..9313a34c5 100644 --- 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);