diff options
| author | Paolo Bonzini <pbonzini@redhat.com> | 2014-07-09 11:53:08 +0200 |
|---|---|---|
| committer | Stefan Hajnoczi <stefanha@redhat.com> | 2014-08-29 10:46:58 +0100 |
| commit | a3462c656128e7b900ccc5d436f9e858d07de264 (patch) | |
| tree | f0a5ba8f06d80bbf14fb27466af9d3126b45c4e9 | |
| parent | 0a9dd1664a0509f7c3c0c7a5550446258ee70f4b (diff) | |
AioContext: introduce aio_prepare
This will be used to implement socket polling on Windows.
On Windows, select() and g_poll() are completely different;
sockets are polled with select() before calling g_poll,
and the g_poll must be nonblocking if select() says a
socket is ready.
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
| -rw-r--r-- | aio-posix.c | 5 | ||||
| -rw-r--r-- | aio-win32.c | 5 | ||||
| -rw-r--r-- | async.c | 5 | ||||
| -rw-r--r-- | include/block/aio.h | 9 |
4 files changed, 23 insertions, 1 deletions
diff --git a/aio-posix.c b/aio-posix.c index 0936b4ff9d..d3ac06e238 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -100,6 +100,11 @@ void aio_set_event_notifier(AioContext *ctx, (IOHandler *)io_read, NULL, notifier); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; diff --git a/aio-win32.c b/aio-win32.c index fd526864be..45422704a4 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -76,6 +76,11 @@ void aio_set_event_notifier(AioContext *ctx, aio_notify(ctx); } +bool aio_prepare(AioContext *ctx) +{ + return false; +} + bool aio_pending(AioContext *ctx) { AioHandler *node; @@ -188,6 +188,11 @@ aio_ctx_prepare(GSource *source, gint *timeout) /* We assume there is no timeout already supplied */ *timeout = qemu_timeout_ns_to_ms(aio_compute_timeout(ctx)); + + if (aio_prepare(ctx)) { + *timeout = 0; + } + return *timeout == 0; } diff --git a/include/block/aio.h b/include/block/aio.h index 7ba3e9675b..ef4197b861 100644 --- a/include/block/aio.h +++ b/include/block/aio.h @@ -205,7 +205,14 @@ void qemu_bh_cancel(QEMUBH *bh); void qemu_bh_delete(QEMUBH *bh); /* Return whether there are any pending callbacks from the GSource - * attached to the AioContext. + * attached to the AioContext, before g_poll is invoked. + * + * This is used internally in the implementation of the GSource. + */ +bool aio_prepare(AioContext *ctx); + +/* Return whether there are any pending callbacks from the GSource + * attached to the AioContext, after g_poll is invoked. * * This is used internally in the implementation of the GSource. */ |