| Message ID | 20170113131731.1246-5-pbonzini@redhat.com |
|---|---|
| State | New |
| Headers | show |
On Fri, 01/13 14:17, Paolo Bonzini wrote: > This is in preparation for making qio_channel_yield work on > AioContexts other than the main one. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > include/io/channel.h | 30 ++++++++++++++++++++++++++++++ > io/channel-command.c | 13 +++++++++++++ > io/channel-file.c | 11 +++++++++++ > io/channel-socket.c | 16 +++++++++++----- > io/channel-tls.c | 12 ++++++++++++ > io/channel-watch.c | 6 ++++++ > io/channel.c | 11 +++++++++++ > 7 files changed, 94 insertions(+), 5 deletions(-) > > diff --git a/include/io/channel.h b/include/io/channel.h > index 32a9470..665edd7 100644 > --- a/include/io/channel.h > +++ b/include/io/channel.h > @@ -23,6 +23,7 @@ > > #include "qemu-common.h" > #include "qom/object.h" > +#include "block/aio.h" > > #define TYPE_QIO_CHANNEL "qio-channel" > #define QIO_CHANNEL(obj) \ > @@ -58,6 +59,8 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc, > GIOCondition condition, > gpointer data); > > +typedef struct QIOChannelRestart QIOChannelRestart; > + > /** > * QIOChannel: > * > @@ -80,6 +83,9 @@ struct QIOChannel { > Object parent; > unsigned int features; /* bitmask of QIOChannelFeatures */ > char *name; > + AioContext *ctx; > + QIOChannelRestart *read_coroutine; > + QIOChannelRestart *write_coroutine; > #ifdef _WIN32 > HANDLE event; /* For use with GSource on Win32 */ > #endif > @@ -132,6 +138,11 @@ struct QIOChannelClass { > off_t offset, > int whence, > Error **errp); > + void (*io_set_aio_fd_handler)(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque); > }; > > /* General I/O handling functions */ > @@ -525,4 +536,23 @@ void qio_channel_yield(QIOChannel *ioc, > void qio_channel_wait(QIOChannel *ioc, > GIOCondition condition); > > +/** > + * qio_channel_set_aio_fd_handler: > + * @ioc: the channel object > + * @ctx: the AioContext to set the handlers on > + * @io_read: the read handler > + * @io_write: the write handler > + * @opaque: the opaque value passed to the handler > + * > + * This is used internally by qio_channel_yield(). It can > + * be used by channel implementations to forward the handlers > + * to another channel (e.g. from #QIOChannelTLS to the > + * underlying socket). > + */ > +void qio_channel_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque); > + > #endif /* QIO_CHANNEL_H */ > diff --git a/io/channel-command.c b/io/channel-command.c > index ad25313..4000b61 100644 > --- a/io/channel-command.c > +++ b/io/channel-command.c > @@ -328,6 +328,18 @@ static int qio_channel_command_close(QIOChannel *ioc, > } > > > +static void qio_channel_command_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) Alignment is a bit off. > +{ > + QIOChannelCommand *cioc = QIO_CHANNEL_COMMAND(ioc); > + aio_set_fd_handler(ctx, cioc->readfd, false, io_read, NULL, NULL, opaque); > + aio_set_fd_handler(ctx, cioc->writefd, false, NULL, io_write, NULL, opaque); > +} > + > + > static GSource *qio_channel_command_create_watch(QIOChannel *ioc, > GIOCondition condition) > { > @@ -349,6 +361,7 @@ static void qio_channel_command_class_init(ObjectClass *klass, > ioc_klass->io_set_blocking = qio_channel_command_set_blocking; > ioc_klass->io_close = qio_channel_command_close; > ioc_klass->io_create_watch = qio_channel_command_create_watch; > + ioc_klass->io_set_aio_fd_handler = qio_channel_command_set_aio_fd_handler; > } > > static const TypeInfo qio_channel_command_info = { > diff --git a/io/channel-file.c b/io/channel-file.c > index e1da243..b383273 100644 > --- a/io/channel-file.c > +++ b/io/channel-file.c > @@ -186,6 +186,16 @@ static int qio_channel_file_close(QIOChannel *ioc, > } > > > +static void qio_channel_file_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) > +{ > + QIOChannelFile *fioc = QIO_CHANNEL_FILE(ioc); > + aio_set_fd_handler(ctx, fioc->fd, false, io_read, io_write, NULL, opaque); > +} > + > static GSource *qio_channel_file_create_watch(QIOChannel *ioc, > GIOCondition condition) > { > @@ -206,6 +216,7 @@ static void qio_channel_file_class_init(ObjectClass *klass, > ioc_klass->io_seek = qio_channel_file_seek; > ioc_klass->io_close = qio_channel_file_close; > ioc_klass->io_create_watch = qio_channel_file_create_watch; > + ioc_klass->io_set_aio_fd_handler = qio_channel_file_set_aio_fd_handler; > } > > static const TypeInfo qio_channel_file_info = { > diff --git a/io/channel-socket.c b/io/channel-socket.c > index d7e03f6..3909f65 100644 > --- a/io/channel-socket.c > +++ b/io/channel-socket.c > @@ -661,11 +661,6 @@ qio_channel_socket_set_blocking(QIOChannel *ioc, > qemu_set_block(sioc->fd); > } else { > qemu_set_nonblock(sioc->fd); > -#ifdef WIN32 > - WSAEventSelect(sioc->fd, ioc->event, > - FD_READ | FD_ACCEPT | FD_CLOSE | > - FD_CONNECT | FD_WRITE | FD_OOB); > -#endif > } > return 0; > } > @@ -745,6 +740,16 @@ qio_channel_socket_shutdown(QIOChannel *ioc, > return 0; > } > > +static void qio_channel_socket_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) > +{ > + QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc); > + aio_set_fd_handler(ctx, sioc->fd, false, io_read, io_write, NULL, opaque); > +} > + > static GSource *qio_channel_socket_create_watch(QIOChannel *ioc, > GIOCondition condition) > { > @@ -767,6 +772,7 @@ static void qio_channel_socket_class_init(ObjectClass *klass, > ioc_klass->io_set_cork = qio_channel_socket_set_cork; > ioc_klass->io_set_delay = qio_channel_socket_set_delay; > ioc_klass->io_create_watch = qio_channel_socket_create_watch; > + ioc_klass->io_set_aio_fd_handler = qio_channel_socket_set_aio_fd_handler; > } > > static const TypeInfo qio_channel_socket_info = { > diff --git a/io/channel-tls.c b/io/channel-tls.c > index d24dc8c..fa3f93e 100644 > --- a/io/channel-tls.c > +++ b/io/channel-tls.c > @@ -349,6 +349,17 @@ static int qio_channel_tls_close(QIOChannel *ioc, > return qio_channel_close(tioc->master, errp); > } > > +static void qio_channel_tls_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) > +{ > + QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc); > + > + qio_channel_set_aio_fd_handler(tioc->master, ctx, io_read, io_write, opaque); > +} > + > static GSource *qio_channel_tls_create_watch(QIOChannel *ioc, > GIOCondition condition) > { > @@ -376,6 +387,7 @@ static void qio_channel_tls_class_init(ObjectClass *klass, > ioc_klass->io_close = qio_channel_tls_close; > ioc_klass->io_shutdown = qio_channel_tls_shutdown; > ioc_klass->io_create_watch = qio_channel_tls_create_watch; > + ioc_klass->io_set_aio_fd_handler = qio_channel_tls_set_aio_fd_handler; > } > > static const TypeInfo qio_channel_tls_info = { > diff --git a/io/channel-watch.c b/io/channel-watch.c > index cf1cdff..8640d1c 100644 > --- a/io/channel-watch.c > +++ b/io/channel-watch.c > @@ -285,6 +285,12 @@ GSource *qio_channel_create_socket_watch(QIOChannel *ioc, > GSource *source; > QIOChannelSocketSource *ssource; > > +#ifdef WIN32 > + WSAEventSelect(socket, ioc->event, > + FD_READ | FD_ACCEPT | FD_CLOSE | > + FD_CONNECT | FD_WRITE | FD_OOB); > +#endif > + Not sure about this code movement (previously it is only for nonblocking), otherwise looks good. Fam > source = g_source_new(&qio_channel_socket_source_funcs, > sizeof(QIOChannelSocketSource)); > ssource = (QIOChannelSocketSource *)source; > diff --git a/io/channel.c b/io/channel.c > index 80924c1..ce470d7 100644 > --- a/io/channel.c > +++ b/io/channel.c > @@ -154,6 +154,17 @@ GSource *qio_channel_create_watch(QIOChannel *ioc, > } > > > +void qio_channel_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) > +{ > + QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); > + > + klass->io_set_aio_fd_handler(ioc, ctx, io_read, io_write, opaque); > +} > + > guint qio_channel_add_watch(QIOChannel *ioc, > GIOCondition condition, > QIOChannelFunc func, > -- > 2.9.3 > >
On Fri, Jan 13, 2017 at 02:17:19PM +0100, Paolo Bonzini wrote: > This is in preparation for making qio_channel_yield work on > AioContexts other than the main one. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Reviewed-by: Daniel P. Berrange <berrange@redhat.com> > diff --git a/io/channel-command.c b/io/channel-command.c > index ad25313..4000b61 100644 > --- a/io/channel-command.c > +++ b/io/channel-command.c > @@ -328,6 +328,18 @@ static int qio_channel_command_close(QIOChannel *ioc, > } > > > +static void qio_channel_command_set_aio_fd_handler(QIOChannel *ioc, > + AioContext *ctx, > + IOHandler *io_read, > + IOHandler *io_write, > + void *opaque) nitpick alignment Regards, Daniel
On Fri, Jan 13, 2017 at 02:17:19PM +0100, Paolo Bonzini wrote: > This is in preparation for making qio_channel_yield work on > AioContexts other than the main one. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > include/io/channel.h | 30 ++++++++++++++++++++++++++++++ > io/channel-command.c | 13 +++++++++++++ > io/channel-file.c | 11 +++++++++++ > io/channel-socket.c | 16 +++++++++++----- > io/channel-tls.c | 12 ++++++++++++ > io/channel-watch.c | 6 ++++++ > io/channel.c | 11 +++++++++++ > 7 files changed, 94 insertions(+), 5 deletions(-) > > diff --git a/include/io/channel.h b/include/io/channel.h > index 32a9470..665edd7 100644 > --- a/include/io/channel.h > +++ b/include/io/channel.h > @@ -80,6 +83,9 @@ struct QIOChannel { > Object parent; > unsigned int features; /* bitmask of QIOChannelFeatures */ > char *name; > + AioContext *ctx; > + QIOChannelRestart *read_coroutine; > + QIOChannelRestart *write_coroutine; This hunk belongs in the next patch since its not used here and you also change the data types in the next patch. Regards, Daniel
On Fri, Jan 13, 2017 at 02:17:19PM +0100, Paolo Bonzini wrote: > This is in preparation for making qio_channel_yield work on > AioContexts other than the main one. > > Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> > --- > include/io/channel.h | 30 ++++++++++++++++++++++++++++++ > io/channel-command.c | 13 +++++++++++++ > io/channel-file.c | 11 +++++++++++ > io/channel-socket.c | 16 +++++++++++----- > io/channel-tls.c | 12 ++++++++++++ > io/channel-watch.c | 6 ++++++ > io/channel.c | 11 +++++++++++ > 7 files changed, 94 insertions(+), 5 deletions(-) Reviewed-by: Stefan Hajnoczi <stefanha@redhat.com>
diff --git a/include/io/channel.h b/include/io/channel.h index 32a9470..665edd7 100644 --- a/include/io/channel.h +++ b/include/io/channel.h @@ -23,6 +23,7 @@ #include "qemu-common.h" #include "qom/object.h" +#include "block/aio.h" #define TYPE_QIO_CHANNEL "qio-channel" #define QIO_CHANNEL(obj) \ @@ -58,6 +59,8 @@ typedef gboolean (*QIOChannelFunc)(QIOChannel *ioc, GIOCondition condition, gpointer data); +typedef struct QIOChannelRestart QIOChannelRestart; + /** * QIOChannel: * @@ -80,6 +83,9 @@ struct QIOChannel { Object parent; unsigned int features; /* bitmask of QIOChannelFeatures */ char *name; + AioContext *ctx; + QIOChannelRestart *read_coroutine; + QIOChannelRestart *write_coroutine; #ifdef _WIN32 HANDLE event; /* For use with GSource on Win32 */ #endif @@ -132,6 +138,11 @@ struct QIOChannelClass { off_t offset, int whence, Error **errp); + void (*io_set_aio_fd_handler)(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque); }; /* General I/O handling functions */ @@ -525,4 +536,23 @@ void qio_channel_yield(QIOChannel *ioc, void qio_channel_wait(QIOChannel *ioc, GIOCondition condition); +/** + * qio_channel_set_aio_fd_handler: + * @ioc: the channel object + * @ctx: the AioContext to set the handlers on + * @io_read: the read handler + * @io_write: the write handler + * @opaque: the opaque value passed to the handler + * + * This is used internally by qio_channel_yield(). It can + * be used by channel implementations to forward the handlers + * to another channel (e.g. from #QIOChannelTLS to the + * underlying socket). + */ +void qio_channel_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque); + #endif /* QIO_CHANNEL_H */ diff --git a/io/channel-command.c b/io/channel-command.c index ad25313..4000b61 100644 --- a/io/channel-command.c +++ b/io/channel-command.c @@ -328,6 +328,18 @@ static int qio_channel_command_close(QIOChannel *ioc, } +static void qio_channel_command_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelCommand *cioc = QIO_CHANNEL_COMMAND(ioc); + aio_set_fd_handler(ctx, cioc->readfd, false, io_read, NULL, NULL, opaque); + aio_set_fd_handler(ctx, cioc->writefd, false, NULL, io_write, NULL, opaque); +} + + static GSource *qio_channel_command_create_watch(QIOChannel *ioc, GIOCondition condition) { @@ -349,6 +361,7 @@ static void qio_channel_command_class_init(ObjectClass *klass, ioc_klass->io_set_blocking = qio_channel_command_set_blocking; ioc_klass->io_close = qio_channel_command_close; ioc_klass->io_create_watch = qio_channel_command_create_watch; + ioc_klass->io_set_aio_fd_handler = qio_channel_command_set_aio_fd_handler; } static const TypeInfo qio_channel_command_info = { diff --git a/io/channel-file.c b/io/channel-file.c index e1da243..b383273 100644 --- a/io/channel-file.c +++ b/io/channel-file.c @@ -186,6 +186,16 @@ static int qio_channel_file_close(QIOChannel *ioc, } +static void qio_channel_file_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelFile *fioc = QIO_CHANNEL_FILE(ioc); + aio_set_fd_handler(ctx, fioc->fd, false, io_read, io_write, NULL, opaque); +} + static GSource *qio_channel_file_create_watch(QIOChannel *ioc, GIOCondition condition) { @@ -206,6 +216,7 @@ static void qio_channel_file_class_init(ObjectClass *klass, ioc_klass->io_seek = qio_channel_file_seek; ioc_klass->io_close = qio_channel_file_close; ioc_klass->io_create_watch = qio_channel_file_create_watch; + ioc_klass->io_set_aio_fd_handler = qio_channel_file_set_aio_fd_handler; } static const TypeInfo qio_channel_file_info = { diff --git a/io/channel-socket.c b/io/channel-socket.c index d7e03f6..3909f65 100644 --- a/io/channel-socket.c +++ b/io/channel-socket.c @@ -661,11 +661,6 @@ qio_channel_socket_set_blocking(QIOChannel *ioc, qemu_set_block(sioc->fd); } else { qemu_set_nonblock(sioc->fd); -#ifdef WIN32 - WSAEventSelect(sioc->fd, ioc->event, - FD_READ | FD_ACCEPT | FD_CLOSE | - FD_CONNECT | FD_WRITE | FD_OOB); -#endif } return 0; } @@ -745,6 +740,16 @@ qio_channel_socket_shutdown(QIOChannel *ioc, return 0; } +static void qio_channel_socket_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelSocket *sioc = QIO_CHANNEL_SOCKET(ioc); + aio_set_fd_handler(ctx, sioc->fd, false, io_read, io_write, NULL, opaque); +} + static GSource *qio_channel_socket_create_watch(QIOChannel *ioc, GIOCondition condition) { @@ -767,6 +772,7 @@ static void qio_channel_socket_class_init(ObjectClass *klass, ioc_klass->io_set_cork = qio_channel_socket_set_cork; ioc_klass->io_set_delay = qio_channel_socket_set_delay; ioc_klass->io_create_watch = qio_channel_socket_create_watch; + ioc_klass->io_set_aio_fd_handler = qio_channel_socket_set_aio_fd_handler; } static const TypeInfo qio_channel_socket_info = { diff --git a/io/channel-tls.c b/io/channel-tls.c index d24dc8c..fa3f93e 100644 --- a/io/channel-tls.c +++ b/io/channel-tls.c @@ -349,6 +349,17 @@ static int qio_channel_tls_close(QIOChannel *ioc, return qio_channel_close(tioc->master, errp); } +static void qio_channel_tls_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelTLS *tioc = QIO_CHANNEL_TLS(ioc); + + qio_channel_set_aio_fd_handler(tioc->master, ctx, io_read, io_write, opaque); +} + static GSource *qio_channel_tls_create_watch(QIOChannel *ioc, GIOCondition condition) { @@ -376,6 +387,7 @@ static void qio_channel_tls_class_init(ObjectClass *klass, ioc_klass->io_close = qio_channel_tls_close; ioc_klass->io_shutdown = qio_channel_tls_shutdown; ioc_klass->io_create_watch = qio_channel_tls_create_watch; + ioc_klass->io_set_aio_fd_handler = qio_channel_tls_set_aio_fd_handler; } static const TypeInfo qio_channel_tls_info = { diff --git a/io/channel-watch.c b/io/channel-watch.c index cf1cdff..8640d1c 100644 --- a/io/channel-watch.c +++ b/io/channel-watch.c @@ -285,6 +285,12 @@ GSource *qio_channel_create_socket_watch(QIOChannel *ioc, GSource *source; QIOChannelSocketSource *ssource; +#ifdef WIN32 + WSAEventSelect(socket, ioc->event, + FD_READ | FD_ACCEPT | FD_CLOSE | + FD_CONNECT | FD_WRITE | FD_OOB); +#endif + source = g_source_new(&qio_channel_socket_source_funcs, sizeof(QIOChannelSocketSource)); ssource = (QIOChannelSocketSource *)source; diff --git a/io/channel.c b/io/channel.c index 80924c1..ce470d7 100644 --- a/io/channel.c +++ b/io/channel.c @@ -154,6 +154,17 @@ GSource *qio_channel_create_watch(QIOChannel *ioc, } +void qio_channel_set_aio_fd_handler(QIOChannel *ioc, + AioContext *ctx, + IOHandler *io_read, + IOHandler *io_write, + void *opaque) +{ + QIOChannelClass *klass = QIO_CHANNEL_GET_CLASS(ioc); + + klass->io_set_aio_fd_handler(ioc, ctx, io_read, io_write, opaque); +} + guint qio_channel_add_watch(QIOChannel *ioc, GIOCondition condition, QIOChannelFunc func,
This is in preparation for making qio_channel_yield work on AioContexts other than the main one. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- include/io/channel.h | 30 ++++++++++++++++++++++++++++++ io/channel-command.c | 13 +++++++++++++ io/channel-file.c | 11 +++++++++++ io/channel-socket.c | 16 +++++++++++----- io/channel-tls.c | 12 ++++++++++++ io/channel-watch.c | 6 ++++++ io/channel.c | 11 +++++++++++ 7 files changed, 94 insertions(+), 5 deletions(-)