After a send we receive and check buffers, make sure that we also handle
short receives.
Signed-off-by: Pavel Begunkov <asml.silence@xxxxxxxxx>
---
test/send-zerocopy.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/test/send-zerocopy.c b/test/send-zerocopy.c
index a572407..d0f5931 100644
--- a/test/send-zerocopy.c
+++ b/test/send-zerocopy.c
@@ -653,6 +653,7 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se
size_t chunk_size = send_size / nr_reqs;
size_t chunk_size_last = send_size - chunk_size * (nr_reqs - 1);
char *buf = buffers_iov[buf_idx].iov_base;
+ size_t bytes_received = 0;
assert(send_size <= buffers_iov[buf_idx].iov_len);
memset(rx_buffer, 0, send_size);
@@ -699,6 +700,18 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se
return 1;
}
+ while (bytes_received != send_size) {
+ ret = recv(sock_server,
+ rx_buffer + bytes_received,
+ send_size - bytes_received, 0);
+ if (ret <= 0) {
+ fprintf(stderr, "recv failed, got %i, errno %i\n",
+ ret, errno);
+ return 1;
+ }
+ bytes_received += ret;
+ }
+
for (i = 0; i < nr_reqs; i++) {
int expected = chunk_size;
@@ -721,13 +734,6 @@ static int do_test_inet_send(struct io_uring *ring, int sock_client, int sock_se
io_uring_cqe_seen(ring, cqe);
}
- ret = recv(sock_server, rx_buffer, send_size, 0);
- if (ret != send_size) {
- fprintf(stderr, "recv less than expected or recv failed, "
- "got %i, errno %i\n", ret, errno);
- return 1;
- }
-
for (i = 0; i < send_size; i++) {
if (buf[i] != rx_buffer[i]) {
fprintf(stderr, "botched data, first mismated byte %i, "
--
2.37.0
