On Fri, Jan 13, 2017 at 02:17:20PM +0100, Paolo Bonzini wrote: > Support separate coroutines for reading and writing, and place the > read/write handlers on the AioContext that the QIOChannel is registered > with. > > Signed-off-by: Paolo Bonzini <pbonz...@redhat.com> > --- > include/io/channel.h | 37 ++++++++++++++++++---- > io/channel.c | 86 > ++++++++++++++++++++++++++++++++++++++------------ > tests/Makefile.include | 2 +- > 3 files changed, 96 insertions(+), 29 deletions(-) > > diff --git a/include/io/channel.h b/include/io/channel.h > index 665edd7..d7bad94 100644 > --- a/include/io/channel.h > +++ b/include/io/channel.h > @@ -23,6 +23,7 @@ > > #include "qemu-common.h" > #include "qom/object.h" > +#include "qemu/coroutine.h" > #include "block/aio.h" > > #define TYPE_QIO_CHANNEL "qio-channel" > @@ -59,8 +60,6 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc, > GIOCondition condition, > gpointer data); > > -typedef struct QIOChannelRestart QIOChannelRestart; > - > /** > * QIOChannel: > * > @@ -84,8 +83,8 @@ struct QIOChannel { > unsigned int features; /* bitmask of QIOChannelFeatures */ > char *name; > AioContext *ctx; > - QIOChannelRestart *read_coroutine; > - QIOChannelRestart *write_coroutine; > + Coroutine *read_coroutine; > + Coroutine *write_coroutine;
Need to squash in part of previous patch here. > #ifdef _WIN32 > HANDLE event; /* For use with GSource on Win32 */ > #endif > @@ -508,13 +507,37 @@ guint qio_channel_add_watch(QIOChannel *ioc, > > > /** > + * qio_channel_set_aio_context: > + * @ioc: the channel object > + * @ctx: the #AioContext to set the handlers on > + * > + * Request that qio_channel_yield() sets I/O handlers on > + * the given #AioContext. If @ctx is %NULL, qio_channel_yield() > + * uses QEMU's main thread event loop. > + */ Can you note that it is explicitly permitted to call this while inside a qio_channel_yield(). > +void qio_channel_set_aio_context(QIOChannel *ioc, > + AioContext *ctx); > + > +/** > + * qio_channel_detach_aio_context: > + * @ioc: the channel object > + * > + * Disable any I/O handlers set by qio_channel_yield(). With the > + * help of aio_co_schedule(), this allows moving a coroutine that was > + * paused by qio_channel_yield() to another context. > + */ > +void qio_channel_detach_aio_context(QIOChannel *ioc); > diff --git a/io/channel.c b/io/channel.c > index ce470d7..1e043bf 100644 > --- a/io/channel.c > +++ b/io/channel.c > @@ -21,7 +21,7 @@ > #include "qemu/osdep.h" > #include "io/channel.h" > #include "qapi/error.h" > -#include "qemu/coroutine.h" > +#include "qemu/main-loop.h" > > bool qio_channel_has_feature(QIOChannel *ioc, > QIOChannelFeature feature) > @@ -238,36 +238,80 @@ off_t qio_channel_io_seek(QIOChannel *ioc, > } > > > -typedef struct QIOChannelYieldData QIOChannelYieldData; > -struct QIOChannelYieldData { > - QIOChannel *ioc; > - Coroutine *co; > -}; > +static void qio_channel_set_aio_fd_handlers(QIOChannel *ioc); > + > +static void qio_channel_restart_read(void *opaque) > +{ > + QIOChannel *ioc = opaque; > + Coroutine *co = ioc->read_coroutine; > > + ioc->read_coroutine = NULL; > + qio_channel_set_aio_fd_handlers(ioc); > + aio_co_wake(co); > +} > > -static gboolean qio_channel_yield_enter(QIOChannel *ioc, > - GIOCondition condition, > - gpointer opaque) > +static void qio_channel_restart_write(void *opaque) > { > - QIOChannelYieldData *data = opaque; > - qemu_coroutine_enter(data->co); > - return FALSE; > + QIOChannel *ioc = opaque; > + Coroutine *co = ioc->write_coroutine; > + > + ioc->write_coroutine = NULL; > + qio_channel_set_aio_fd_handlers(ioc); > + aio_co_wake(co); > } > > +static void qio_channel_set_aio_fd_handlers(QIOChannel *ioc) > +{ > + IOHandler *rd_handler = NULL, *wr_handler = NULL; > + AioContext *ctx; > + > + if (ioc->read_coroutine) { > + rd_handler = qio_channel_restart_read; > + } > + if (ioc->write_coroutine) { > + rd_handler = qio_channel_restart_write; > + } Tab damage. 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/ :|