[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 08/10] AioContext: introduce aio_prepare
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 08/10] AioContext: introduce aio_prepare |
Date: |
Wed, 9 Jul 2014 11:53:08 +0200 |
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 <address@hidden>
---
aio-posix.c | 5 +++++
aio-win32.c | 5 +++++
async.c | 5 +++++
include/block/aio.h | 9 ++++++++-
4 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/aio-posix.c b/aio-posix.c
index 0936b4f..d3ac06e 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 fd52686..4542270 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;
diff --git a/async.c b/async.c
index a5126ff..bcba052 100644
--- a/async.c
+++ b/async.c
@@ -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 45408f7..d129e22 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.
*/
--
1.9.3
- [Qemu-devel] [PATCH for-2.2 00/10] AioContext cleanups and Win32 socket support, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 01/10] AioContext: take bottom halves into account when computing aio_poll timeout, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 03/10] aio-win32: Factor out duplicate code into aio_dispatch_handlers, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 02/10] aio-win32: Evaluate timers after handles, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 04/10] AioContext: run bottom halves after polling, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 05/10] AioContext: export and use aio_dispatch, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 06/10] test-aio: test timers on Windows too, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 07/10] aio-win32: add aio_set_dispatching optimization, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 08/10] AioContext: introduce aio_prepare,
Paolo Bonzini <=
- [Qemu-devel] [PATCH 09/10] qemu-coroutine-io: fix for Win32, Paolo Bonzini, 2014/07/09
- [Qemu-devel] [PATCH 10/10] aio-win32: add support for sockets, Paolo Bonzini, 2014/07/09