diff options
author | Michael Tokarev <mjt@tls.msk.ru> | 2012-03-10 17:00:41 +0400 |
---|---|---|
committer | Michael Tokarev <mjt@tls.msk.ru> | 2012-06-11 23:12:11 +0400 |
commit | 3e80bf9351f8fec9085c46df6da075efd5e71003 (patch) | |
tree | 907baf3990393ab15a0bc09fd3c75033a5712601 /qemu-coroutine-io.c | |
parent | d5e6b1619c516fa1e2ee4d8d20f08fcda4fb67a0 (diff) | |
download | qemu-3e80bf9351f8fec9085c46df6da075efd5e71003.zip qemu-3e80bf9351f8fec9085c46df6da075efd5e71003.tar.gz qemu-3e80bf9351f8fec9085c46df6da075efd5e71003.tar.bz2 |
rename qemu_sendv to iov_send, change proto and move declarations to iov.h
Rename arguments and use size_t for sizes instead of int,
from
int
qemu_sendv(int sockfd, struct iovec *iov,
int len, int iov_offset)
to
ssize_t
iov_send(int sockfd, struct iovec *iov,
size_t offset, size_t bytes)
The main motivation was to make it clear that length
and offset are in _bytes_, not in iov elements: it was
very confusing before, because all standard functions
which deals with iovecs expects number of iovs, not
bytes, even the fact that struct iovec has iov_len and
iov_ prefix does not help. With "bytes" and "offset",
especially since they're now size_t, it is much more
explicit. Also change the return type to be ssize_t
instead of int.
This also changes it to match other iov-related functons,
but not _quite_: there's still no argument indicating
where iovec ends, ie, no iov_cnt parameter as used
in iov_size() and friends. If will be added in subsequent
patch/rewrite.
All callers of qemu_sendv() and qemu_recvv() and
related, like qemu_co_sendv() and qemu_co_recvv(),
were checked to verify that it is safe to use unsigned
datatype instead of int.
Note that the order of arguments is changed to: offset
and bytes (len and iov_offset) are swapped with each
other. This is to make them consistent with very similar
functions from qemu_iovec family, where offset always
follows qiov, to mean the place in it to start from.
Signed-off-by: Michael Tokarev <mjt@tls.msk.ru>
Diffstat (limited to 'qemu-coroutine-io.c')
-rw-r--r-- | qemu-coroutine-io.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c index 40fd514..0461a9a 100644 --- a/qemu-coroutine-io.c +++ b/qemu-coroutine-io.c @@ -25,6 +25,7 @@ #include "qemu-common.h" #include "qemu_socket.h" #include "qemu-coroutine.h" +#include "iov.h" int coroutine_fn qemu_co_recvv(int sockfd, struct iovec *iov, int len, int iov_offset) @@ -32,7 +33,7 @@ int coroutine_fn qemu_co_recvv(int sockfd, struct iovec *iov, int total = 0; int ret; while (len) { - ret = qemu_recvv(sockfd, iov, len, iov_offset + total); + ret = iov_recv(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield(); @@ -58,7 +59,7 @@ int coroutine_fn qemu_co_sendv(int sockfd, struct iovec *iov, int total = 0; int ret; while (len) { - ret = qemu_sendv(sockfd, iov, len, iov_offset + total); + ret = iov_send(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield(); |