david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iov: reorganize iov_send_recv, part 1

Browse Source 
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 <quintela@redhat.com>
Reviewed-by: Orit Wassermann <owasserm@redhat.com>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Paolo Bonzini 2013-03-27 17:36:28 +01:00
parent 15711565f6
commit cb6247a7e3
1 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
util/iov.c
View File

@ -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) { for (si = 0; si < iov_cnt && offset >= iov[si].iov_len; ++si) {
offset -= iov[si].iov_len; offset -= iov[si].iov_len;
} }
if (offset) {
/* si == iov_cnt would only be valid if bytes == 0, which
* we already ruled out above. */
assert(si < iov_cnt); assert(si < iov_cnt);
iov += si;
iov_cnt -= si;
if (offset) {
/* second, skip `offset' bytes from the (now) first element, /* second, skip `offset' bytes from the (now) first element,
* undo it on exit */ * undo it on exit */
iov[si].iov_base += offset; iov[0].iov_base += offset;
iov[si].iov_len -= offset; iov[0].iov_len -= offset;
} }
/* Find the end position skipping `bytes' bytes: */ /* Find the end position skipping `bytes' bytes: */
/* first, skip all full-sized elements */ /* 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; bytes -= iov[ei].iov_len;
} }
if (bytes) { if (bytes) {
@ -183,12 +189,12 @@ ssize_t iov_send_recv(int sockfd, struct iovec *iov, unsigned iov_cnt,
++ei; ++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 */ /* Undo the changes above */
if (offset) { if (offset) {
iov[si].iov_base -= offset; iov[0].iov_base -= offset;
iov[si].iov_len += offset; iov[0].iov_len += offset;
} }
if (bytes) { if (bytes) {
iov[ei-1].iov_len += bytes; iov[ei-1].iov_len += bytes;