X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=liblttkconsumerd%2Fliblttkconsumerd.c;h=1e86d28d0cc1ea9cf6afecfb22f554b040ebef13;hb=059008c7017e1148c77e4ec7050227f80300c5bd;hp=e11229abd5dca98661aa653be113c6b74a6e088c;hpb=4de84ad900e5b6e739f3c36aa1b86746081333d7;p=lttng-tools.git diff --git a/liblttkconsumerd/liblttkconsumerd.c b/liblttkconsumerd/liblttkconsumerd.c index e11229abd..1e86d28d0 100644 --- a/liblttkconsumerd/liblttkconsumerd.c +++ b/liblttkconsumerd/liblttkconsumerd.c @@ -124,7 +124,6 @@ static int kconsumerd_find_session_fd(int fd) cds_list_for_each_entry(iter, &kconsumerd_data.fd_list.head, list) { if (iter->sessiond_fd == fd) { DBG("Duplicate session fd %d", fd); - pthread_mutex_unlock(&kconsumerd_data.lock); return 1; } } @@ -651,6 +650,9 @@ static int kconsumerd_consumerd_recv_fd(int sfd, } /* signal the poll thread */ tmp2 = write(kconsumerd_poll_pipe[1], "4", 1); + if (tmp2 < 0) { + perror("write kconsumerd poll"); + } } else { ERR("Didn't received any fd"); kconsumerd_send_error(KCONSUMERD_ERROR_RECV_FD); @@ -762,6 +764,9 @@ void *kconsumerd_thread_poll_fds(void *data) if (pollfd[nb_fd].revents == POLLIN) { DBG("kconsumerd_poll_pipe wake up"); tmp2 = read(kconsumerd_poll_pipe[0], &tmp, 1); + if (tmp2 < 0) { + perror("read kconsumerd poll"); + } continue; } @@ -1020,6 +1025,9 @@ void kconsumerd_should_exit(void) int ret; kconsumerd_quit = 1; ret = write(kconsumerd_should_quit[1], "4", 1); + if (ret < 0) { + perror("write kconsumerd quit"); + } } /*