From patchwork Mon Mar 12 19:14:20 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Tokarev X-Patchwork-Id: 146218 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 1F9B2B6FA4 for ; Tue, 13 Mar 2012 06:16:46 +1100 (EST) Received: from localhost ([::1]:49725 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Ajb-0000vC-UX for incoming@patchwork.ozlabs.org; Mon, 12 Mar 2012 15:16:43 -0400 Received: from eggs.gnu.org ([208.118.235.92]:55850) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7AjK-0000Xw-73 for qemu-devel@nongnu.org; Mon, 12 Mar 2012 15:16:32 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1S7Ait-0005s0-AC for qemu-devel@nongnu.org; Mon, 12 Mar 2012 15:16:25 -0400 Received: from isrv.corpit.ru ([86.62.121.231]:46817) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1S7Ais-0005r9-Uu for qemu-devel@nongnu.org; Mon, 12 Mar 2012 15:15:59 -0400 Received: from gandalf.tls.msk.ru (mjt.vpn.tls.msk.ru [192.168.177.99]) by isrv.corpit.ru (Postfix) with ESMTP id 799D9A0906; Mon, 12 Mar 2012 23:15:57 +0400 (MSK) Received: by gandalf.tls.msk.ru (Postfix, from userid 1000) id 151612BCE; Mon, 12 Mar 2012 23:14:41 +0400 (MSK) From: Michael Tokarev To: qemu-devel@nongnu.org Date: Mon, 12 Mar 2012 23:14:20 +0400 Message-Id: <1331579663-29950-7-git-send-email-mjt@msgid.tls.msk.ru> X-Mailer: git-send-email 1.7.9.1 In-Reply-To: <1331579663-29950-1-git-send-email-mjt@msgid.tls.msk.ru> References: <1331579663-29950-1-git-send-email-mjt@msgid.tls.msk.ru> X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 86.62.121.231 Cc: Paolo Bonzini , Michael Tokarev Subject: [Qemu-devel] [PATCHv3 6/9] change prototypes of qemu_sendv() and qemu_recvv() X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org 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 qemu_sendv(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 it were to be added, it should go before offset. 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 --- cutils.c | 37 +++++++++++++++++++------------------ qemu-common.h | 4 ++-- qemu-coroutine-io.c | 4 ++-- 3 files changed, 23 insertions(+), 22 deletions(-) diff --git a/cutils.c b/cutils.c index df26f72..e9052fc 100644 --- a/cutils.c +++ b/cutils.c @@ -381,38 +381,39 @@ int qemu_parse_fd(const char *param) * * This function send/recv data from/to the iovec buffer directly. * The first `offset' bytes in the iovec buffer are skipped and next - * `len' bytes are used. + * `bytes' bytes are used, which must be within data of iovec. * - * For example, + * r = do_sendv_recvv(sockfd, iov, offset, bytes, 1); * - * do_sendv_recvv(sockfd, iov, len, offset, 1); + * is logically equivalent to * - * is equal to - * - * char *buf = malloc(size); - * iov_to_buf(iov, iovcnt, buf, offset, size); - * send(sockfd, buf, size, 0); + * char *buf = malloc(bytes); + * iov_to_buf(iov, iovcnt, offset, buf, size); + * r = send(sockfd, buf, size, 0); * free(buf); */ -static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, +static ssize_t do_sendv_recvv(int sockfd, struct iovec *iov, + size_t offset, size_t bytes, int do_sendv) { - int ret, diff, iovlen; + int iovlen; + ssize_t ret; + size_t diff; struct iovec *last_iov; /* last_iov is inclusive, so count from one. */ iovlen = 1; last_iov = iov; - len += offset; + bytes += offset; - while (last_iov->iov_len < len) { - len -= last_iov->iov_len; + while (last_iov->iov_len < bytes) { + bytes -= last_iov->iov_len; last_iov++; iovlen++; } - diff = last_iov->iov_len - len; + diff = last_iov->iov_len - bytes; last_iov->iov_len -= diff; while (iov->iov_len <= offset) { @@ -474,13 +475,13 @@ static int do_sendv_recvv(int sockfd, struct iovec *iov, int len, int offset, return ret; } -int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset) +ssize_t qemu_recvv(int sockfd, struct iovec *iov, size_t offset, size_t bytes) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 0); + return do_sendv_recvv(sockfd, iov, offset, bytes, 0); } -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset) +ssize_t qemu_sendv(int sockfd, struct iovec *iov, size_t offset, size_t bytes) { - return do_sendv_recvv(sockfd, iov, len, iov_offset, 1); + return do_sendv_recvv(sockfd, iov, offset, bytes, 1); } diff --git a/qemu-common.h b/qemu-common.h index ec9655b..8d12fca 100644 --- a/qemu-common.h +++ b/qemu-common.h @@ -199,8 +199,8 @@ int qemu_pipe(int pipefd[2]); #define qemu_recv(sockfd, buf, len, flags) recv(sockfd, buf, len, flags) #endif -int qemu_recvv(int sockfd, struct iovec *iov, int len, int iov_offset); -int qemu_sendv(int sockfd, struct iovec *iov, int len, int iov_offset); +ssize_t qemu_recvv(int sockfd, struct iovec *iov, size_t offset, size_t bytes); +ssize_t qemu_sendv(int sockfd, struct iovec *iov, size_t offset, size_t bytes); /* Error handling. */ diff --git a/qemu-coroutine-io.c b/qemu-coroutine-io.c index 40fd514..df8ff21 100644 --- a/qemu-coroutine-io.c +++ b/qemu-coroutine-io.c @@ -32,7 +32,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 = qemu_recvv(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield(); @@ -58,7 +58,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 = qemu_sendv(sockfd, iov, iov_offset + total, len); if (ret < 0) { if (errno == EAGAIN) { qemu_coroutine_yield();