From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([208.118.235.92]:39089) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIkJE-0005js-UF for qemu-devel@nongnu.org; Thu, 21 Mar 2013 14:33:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1UIkJB-0003Ks-Tc for qemu-devel@nongnu.org; Thu, 21 Mar 2013 14:33:52 -0400 Received: from mx1.redhat.com ([209.132.183.28]:23834) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1UIkJB-0003Kf-K4 for qemu-devel@nongnu.org; Thu, 21 Mar 2013 14:33:49 -0400 From: Orit Wasserman Date: Thu, 21 Mar 2013 20:34:38 +0200 Message-Id: <1363890878-8161-9-git-send-email-owasserm@redhat.com> In-Reply-To: <1363890878-8161-1-git-send-email-owasserm@redhat.com> References: <1363890878-8161-1-git-send-email-owasserm@redhat.com> Subject: [Qemu-devel] [PATCH v4 8/8] coalesce adjacent iovecs List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Orit Wasserman , pbonzini@redhat.com, mst@redhat.com, chegu_vinod@hp.com, quintela@redhat.com This way we send one big buffer instead of many small ones Signed-off-by: Orit Wasserman --- savevm.c | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/savevm.c b/savevm.c index b024354..9e8ddee 100644 --- a/savevm.c +++ b/savevm.c @@ -622,6 +622,18 @@ int qemu_fclose(QEMUFile *f) return ret; } +static void add_to_iovec(QEMUFile *f, const uint8_t *buf, int size) +{ + /* check for adjoint buffer and colasce them */ + if (f->iovcnt > 0 && buf == f->iov[f->iovcnt - 1].iov_base + + f->iov[f->iovcnt - 1].iov_len) { + f->iov[f->iovcnt - 1].iov_len += size; + } else { + f->iov[f->iovcnt].iov_base = (uint8_t *)buf; + f->iov[f->iovcnt++].iov_len = size; + } +} + void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) { if (f->last_error) { @@ -634,8 +646,7 @@ void qemu_put_buffer_async(QEMUFile *f, const uint8_t *buf, int size) abort(); } - f->iov[f->iovcnt].iov_base = (uint8_t *)buf; - f->iov[f->iovcnt++].iov_len = size; + add_to_iovec(f, buf, size); f->is_write = 1; f->bytes_xfer += size; @@ -690,8 +701,8 @@ void qemu_put_byte(QEMUFile *f, int v) f->buf[f->buf_index++] = v; f->is_write = 1; f->bytes_xfer++; - f->iov[f->iovcnt].iov_base = f->buf + (f->buf_index - 1); - f->iov[f->iovcnt++].iov_len = 1; + + add_to_iovec(f, f->buf + (f->buf_index - 1), 1); if (f->buf_index >= IO_BUF_SIZE || f->iovcnt >= MAX_IOV_SIZE) { qemu_fflush(f); -- 1.7.11.7