| Message ID | 20170313124434.1043-2-quintela@redhat.com |
|---|---|
| State | New |
| Headers | show |
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 <quintela@redhat.com> > --- > 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
"Daniel P. Berrange" <berrange@redhat.com> wrote: > 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. >> > > 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 Ok, I integreted together the two patches, and added tests for: qio_channel_writev - qio_channel_readv qio_channel_writev_all - qio_channel_readv qio_channel_writev - qio_channel_readv_all qio_channel_writev_all - qio_channel_readv_all I did it only for test-io-channel-buffer.c, though. Thanks, Juan.
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; +} + ssize_t qio_channel_readv(QIOChannel *ioc, const struct iovec *iov, size_t niov, diff --git a/migration/qemu-file-channel.c b/migration/qemu-file-channel.c index 45c13f1..dd95e06 100644 --- a/migration/qemu-file-channel.c +++ b/migration/qemu-file-channel.c @@ -34,35 +34,8 @@ static ssize_t channel_writev_buffer(void *opaque, int64_t pos) { QIOChannel *ioc = QIO_CHANNEL(opaque); - ssize_t done = 0; - struct iovec *local_iov = g_new(struct iovec, iovcnt); - struct iovec *local_iov_head = local_iov; - unsigned int nlocal_iov = iovcnt; - nlocal_iov = iov_copy(local_iov, nlocal_iov, - iov, iovcnt, - 0, iov_size(iov, iovcnt)); - - while (nlocal_iov > 0) { - ssize_t len; - len = qio_channel_writev(ioc, local_iov, nlocal_iov, NULL); - if (len == QIO_CHANNEL_ERR_BLOCK) { - qio_channel_wait(ioc, G_IO_OUT); - continue; - } - if (len < 0) { - /* XXX handle Error objects */ - done = -EIO; - goto cleanup; - } - - iov_discard_front(&local_iov, &nlocal_iov, len); - done += len; - } - - cleanup: - g_free(local_iov_head); - return done; + return qio_channel_writev_all(ioc, iov, iovcnt, NULL); }
The function waits until it is able to write the full iov. Signed-off-by: Juan Quintela <quintela@redhat.com> --- include/io/channel.h | 23 +++++++++++++++++++++++ io/channel.c | 39 +++++++++++++++++++++++++++++++++++++++ migration/qemu-file-channel.c | 29 +---------------------------- 3 files changed, 63 insertions(+), 28 deletions(-)