From 76ea27a627742c8a6c40261287d322b7656cc43d Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Tue, 16 Apr 2019 11:00:49 +0200 Subject: libubus: attempt to receive data before calling poll Data is often already present here Signed-off-by: Felix Fietkau --- libubus-io.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/libubus-io.c b/libubus-io.c index 887e88c..228af5c 100644 --- a/libubus-io.c +++ b/libubus-io.c @@ -174,9 +174,6 @@ static int recv_retry(struct ubus_context *ctx, struct iovec *iov, bool wait, in }; while (iov->iov_len > 0) { - if (wait) - wait_data(fd, false); - if (recv_fd) { msghdr.msg_control = &fd_buf; msghdr.msg_controllen = sizeof(fd_buf); @@ -210,6 +207,9 @@ static int recv_retry(struct ubus_context *ctx, struct iovec *iov, bool wait, in iov->iov_len -= bytes; iov->iov_base += bytes; total += bytes; + + if (iov->iov_len > 0) + wait_data(fd, false); } return total; -- cgit v1.2.1