From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:38785) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cnSqm-0005TE-37 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:29:37 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cnSqi-0007TE-Sz for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:29:36 -0400 Received: from mx1.redhat.com ([209.132.183.28]:44796) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cnSqi-0007T6-K8 for qemu-devel@nongnu.org; Mon, 13 Mar 2017 12:29:32 -0400 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 81FEE33564D for ; Mon, 13 Mar 2017 16:29:32 +0000 (UTC) Date: Mon, 13 Mar 2017 16:29:09 +0000 From: "Daniel P. Berrange" Message-ID: <20170313162909.GI4799@redhat.com> Reply-To: "Daniel P. Berrange" References: <20170313124434.1043-1-quintela@redhat.com> <20170313124434.1043-2-quintela@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20170313124434.1043-2-quintela@redhat.com> Subject: Re: [Qemu-devel] [PATCH 01/16] qio: create new qio_channel_write_all List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Juan Quintela Cc: qemu-devel@nongnu.org, amit.shah@redhat.com, dgilbert@redhat.com On Mon, Mar 13, 2017 at 01:44:19PM +0100, Juan Quintela wrote: > The function waits until it is able to write the full iov. > > Signed-off-by: Juan Quintela > --- > include/io/channel.h | 23 +++++++++++++++++++++++ > io/channel.c | 39 +++++++++++++++++++++++++++++++++++++++ > migration/qemu-file-channel.c | 29 +---------------------------- > 3 files changed, 63 insertions(+), 28 deletions(-) > > diff --git a/include/io/channel.h b/include/io/channel.h > index 5d48906..f786c4f 100644 > --- a/include/io/channel.h > +++ b/include/io/channel.h > @@ -269,6 +269,29 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, > Error **errp); > > /** > + * qio_channel_writev_all: > + * @ioc: the channel object > + * @iov: the array of memory regions to write data from > + * @niov: the length of the @iov array > + * @errp: pointer to a NULL-initialized error object > + * > + * Write data to the IO channel, reading it from the > + * memory regions referenced by @iov. Each element > + * in the @iov will be fully sent, before the next > + * one is used. The @niov parameter specifies the > + * total number of elements in @iov. > + * > + * It is required for all @iov data to be fully > + * sent. > + * > + * Returns: the number of bytes sent, or -1 on error, > + */ > +ssize_t qio_channel_writev_all(QIOChannel *ioc, > + const struct iovec *iov, > + size_t niov, > + Error **erp); > + > +/** > * qio_channel_readv: > * @ioc: the channel object > * @iov: the array of memory regions to read data into > diff --git a/io/channel.c b/io/channel.c > index cdf7454..c5a1bd5 100644 > --- a/io/channel.c > +++ b/io/channel.c > @@ -22,6 +22,7 @@ > #include "io/channel.h" > #include "qapi/error.h" > #include "qemu/main-loop.h" > +#include "qemu/iov.h" > > bool qio_channel_has_feature(QIOChannel *ioc, > QIOChannelFeature feature) > @@ -85,6 +86,44 @@ ssize_t qio_channel_writev_full(QIOChannel *ioc, > } > > > + > +ssize_t qio_channel_writev_all(QIOChannel *ioc, > + const struct iovec *iov, > + size_t niov, > + Error **errp) > +{ > + ssize_t done = 0; > + struct iovec *local_iov = g_new(struct iovec, niov); > + struct iovec *local_iov_head = local_iov; > + unsigned int nlocal_iov = niov; > + > + nlocal_iov = iov_copy(local_iov, nlocal_iov, > + iov, niov, > + 0, iov_size(iov, niov)); > + > + while (nlocal_iov > 0) { > + ssize_t len; > + len = qio_channel_writev(ioc, local_iov, nlocal_iov, errp); > + if (len == QIO_CHANNEL_ERR_BLOCK) { > + qio_channel_wait(ioc, G_IO_OUT); > + continue; > + } > + if (len < 0) { > + error_setg_errno(errp, EIO, > + "Channel was not able to write full iov"); > + done = -1; > + goto cleanup; > + } > + > + iov_discard_front(&local_iov, &nlocal_iov, len); > + done += len; > + } > + > + cleanup: > + g_free(local_iov_head); > + return done; > +} > + Can you make sure this is covered in the test suite. Something added or changed in tests/io-channel-helpers.c should be sufficient. eg use it from test_io_thread_writer() when applicable Regards, Daniel -- |: http://berrange.com -o- http://www.flickr.com/photos/dberrange/ :| |: http://libvirt.org -o- http://virt-manager.org :| |: http://entangle-photo.org -o- http://search.cpan.org/~danberr/ :|