Add kernel enable event support

[lttng-tools.git] / kconsumerd / kconsumerd.c

diff --git a/kconsumerd/kconsumerd.c b/kconsumerd/kconsumerd.c
index 315095ee3c102794817176262d096e1b21089b96..4c9c089aa9e5268da6575ca777b05f4d1ad5ec15 100644 (file)
--- a/kconsumerd/kconsumerd.c
+++ b/kconsumerd/kconsumerd.c
@@ -511,13 +511,13 @@ static void *thread_receive_fds(void *data)
                goto error;
        }
 
+       /* Blocking call, waiting for transmission */
+       sock = lttcomm_accept_unix_sock(client_socket);
+       if (sock <= 0) {
+               WARN("On accept, retrying");
+               goto error;
+       }
        while (1) {
-               /* Blocking call, waiting for transmission */
-               sock = lttcomm_accept_unix_sock(client_socket);
-               if (sock <= 0) {
-                       WARN("On accept, retrying");
-                       continue;
-               }
 
                /* We first get the number of fd we are about to receive */
                ret = lttcomm_recv_unix_sock(sock, &tmp,
@@ -581,8 +581,8 @@ static int update_poll_array(struct pollfd **pollfd,
                DBG("Inside for each");
                if (iter->state == ACTIVE_FD) {
                        DBG("Active FD %d", iter->consumerd_fd);
-                       pollfd[i]->fd = iter->consumerd_fd;
-                       pollfd[i]->events = POLLIN | POLLPRI;
+                       (*pollfd)[i].fd = iter->consumerd_fd;
+                       (*pollfd)[i].events = POLLIN | POLLPRI;
                        local_kconsumerd_fd[i] = iter;
                        i++;
                } else if (iter->state == DELETE_FD) {