[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCHv5 09/11] export iov_send_recv() and use it in iov_se
From: |
Michael Tokarev |
Subject: |
[Qemu-devel] [PATCHv5 09/11] export iov_send_recv() and use it in iov_send() and iov_recv() |
Date: |
Tue, 20 Mar 2012 01:22:17 +0400 |
Rename do_sendv_recvv() to iov_send_recv(), change its last arg
(do_send) from int to bool, export it in iov.h, and made the two
callers of it (iov_send() and iov_recv()) to be trivial #defines
just adding 5th arg.
iov_send_recv() will be used later.
Signed-off-by: Michael Tokarev <address@hidden>
---
cutils.c | 17 +++--------------
iov.h | 10 +++++++---
2 files changed, 10 insertions(+), 17 deletions(-)
diff --git a/cutils.c b/cutils.c
index 2ad5fa3..cb6f638 100644
--- a/cutils.c
+++ b/cutils.c
@@ -376,9 +376,9 @@ int qemu_parse_fd(const char *param)
return fd;
}
-static ssize_t do_sendv_recvv(int sockfd, struct iovec *iov,
- size_t offset, size_t bytes,
- int do_sendv)
+ssize_t iov_send_recv(int sockfd, struct iovec *iov,
+ size_t offset, size_t bytes,
+ bool do_sendv)
{
int iovlen;
ssize_t ret;
@@ -458,14 +458,3 @@ static ssize_t do_sendv_recvv(int sockfd, struct iovec
*iov,
last_iov->iov_len += diff;
return ret;
}
-
-ssize_t iov_recv(int sockfd, struct iovec *iov, size_t offset, size_t bytes)
-{
- return do_sendv_recvv(sockfd, iov, offset, bytes, 0);
-}
-
-ssize_t iov_send(int sockfd, struct iovec *iov, size_t offset, size_t bytes)
-{
- return do_sendv_recvv(sockfd, iov, offset, bytes, 1);
-}
-
diff --git a/iov.h b/iov.h
index 5aa2f45..9b6a883 100644
--- a/iov.h
+++ b/iov.h
@@ -60,7 +60,7 @@ size_t iov_memset(const struct iovec *iov, const unsigned int
iov_cnt,
* `offset' bytes in the beginning of iovec buffer are skipped and
* next `bytes' bytes are used, which must be within data of iovec.
*
- * r = iov_send(sockfd, iov, offset, bytes);
+ * r = iov_send_recv(sockfd, iov, offset, bytes, true);
*
* is logically equivalent to
*
@@ -69,8 +69,12 @@ size_t iov_memset(const struct iovec *iov, const unsigned
int iov_cnt,
* r = send(sockfd, buf, bytes, 0);
* free(buf);
*/
-ssize_t iov_recv(int sockfd, struct iovec *iov, size_t offset, size_t bytes);
-ssize_t iov_send(int sockfd, struct iovec *iov, size_t offset, size_t bytes);
+ssize_t iov_send_recv(int sockfd, struct iovec *iov,
+ size_t offset, size_t bytes, bool do_send);
+#define iov_recv(sockfd, iov, offset, bytes) \
+ iov_send_recv(sockfd, iov, offset, bytes, false)
+#define iov_send(sockfd, iov, offset, bytes) \
+ iov_send_recv(sockfd, iov, offset, bytes, true)
/**
* Produce a text hexdump of iovec `iov' with `iov_cnt' number of elements
--
1.7.9.1
- [Qemu-devel] [PATCHv5 05/11] allow qemu_iovec_from_buffer() to specify offset from which to start copying, (continued)
- [Qemu-devel] [PATCHv5 05/11] allow qemu_iovec_from_buffer() to specify offset from which to start copying, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 02/11] change iov_* function prototypes to be more appropriate, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 08/11] rename qemu_sendv to iov_send, change proto and move declarations to iov.h, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 04/11] consolidate qemu_iovec_memset{, _skip}() into single function and use existing iov_memset(), Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 11/11] rewrite iov_send_recv() and move it to iov.c, Michael Tokarev, 2012/03/19
- Re: [Qemu-devel] [PATCHv5 00/11] cleanup/consolidate iovec functions, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 01/11] virtio-serial-bus: use correct lengths in control_out() message, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 03/11] rewrite iov_* functions, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 06/11] consolidate qemu_iovec_copy() and qemu_iovec_concat() and make them consistent, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 07/11] change qemu_iovec_to_buf() to match other to, from_buf functions, Michael Tokarev, 2012/03/19
- [Qemu-devel] [PATCHv5 09/11] export iov_send_recv() and use it in iov_send() and iov_recv(),
Michael Tokarev <=