[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 2/6] iov: reorganize iov_send_recv, part 1
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 2/6] iov: reorganize iov_send_recv, part 1 |
Date: |
Wed, 17 Apr 2013 11:46:48 +0200 |
Once the initial part of the iov is dropped, it is not used anymore.
Modify iov/iovcnt directly instead of adjusting them with the "si"
variable.
Reviewed-by: Juan Quintela <address@hidden>
Reviewed-by: Orit Wassermann <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
util/iov.c | 20 +++++++++++++-------
1 file changed, 13 insertions(+), 7 deletions(-)
diff --git a/util/iov.c b/util/iov.c
index 9dae318..adb9a70 100644
--- a/util/iov.c
+++ b/util/iov.c
@@ -159,16 +159,22 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov,
unsigned iov_cnt,
for (si = 0; si < iov_cnt && offset >= iov[si].iov_len; ++si) {
offset -= iov[si].iov_len;
}
+
+ /* si == iov_cnt would only be valid if bytes == 0, which
+ * we already ruled out above. */
+ assert(si < iov_cnt);
+ iov += si;
+ iov_cnt -= si;
+
if (offset) {
- assert(si < iov_cnt);
/* second, skip `offset' bytes from the (now) first element,
* undo it on exit */
- iov[si].iov_base += offset;
- iov[si].iov_len -= offset;
+ iov[0].iov_base += offset;
+ iov[0].iov_len -= offset;
}
/* Find the end position skipping `bytes' bytes: */
/* first, skip all full-sized elements */
- for (ei = si; ei < iov_cnt && iov[ei].iov_len <= bytes; ++ei) {
+ for (ei = 0; ei < iov_cnt && iov[ei].iov_len <= bytes; ++ei) {
bytes -= iov[ei].iov_len;
}
if (bytes) {
@@ -183,12 +189,12 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov,
unsigned iov_cnt,
++ei;
}
- ret = do_send_recv(sockfd, iov + si, ei - si, do_send);
+ ret = do_send_recv(sockfd, iov, ei, do_send);
/* Undo the changes above */
if (offset) {
- iov[si].iov_base -= offset;
- iov[si].iov_len += offset;
+ iov[0].iov_base -= offset;
+ iov[0].iov_len += offset;
}
if (bytes) {
iov[ei-1].iov_len += bytes;
--
1.8.1.4
- [Qemu-devel] [PULL (rebased) 0/6] migration: followups for writev patches, Paolo Bonzini, 2013/04/17
- [Qemu-devel] [PATCH 1/6] qemu-file: drop socket_put_buffer, Paolo Bonzini, 2013/04/17
- [Qemu-devel] [PATCH 4/6] iov: reorganize iov_send_recv, part 3, Paolo Bonzini, 2013/04/17
- [Qemu-devel] [PATCH 2/6] iov: reorganize iov_send_recv, part 1,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 3/6] iov: reorganize iov_send_recv, part 2, Paolo Bonzini, 2013/04/17
- [Qemu-devel] [PATCH 5/6] iov: handle partial writes from sendmsg and recvmsg, Paolo Bonzini, 2013/04/17
- [Qemu-devel] [PATCH 6/6] qemu-file: do not use stdio for qemu_fdopen, Paolo Bonzini, 2013/04/17