[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 04/10] AioContext: run bottom halves after polling
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH 04/10] AioContext: run bottom halves after polling |
Date: |
Wed, 9 Jul 2014 11:53:04 +0200 |
Make the dispatching phase the same before blocking and afterwards.
The next patch will make aio_dispatch public and use it directly
for the GSource case, instead of aio_poll. aio_poll can then be
simplified heavily.
Signed-off-by: Paolo Bonzini <address@hidden>
---
aio-posix.c | 4 ++++
aio-win32.c | 8 +++++++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/aio-posix.c b/aio-posix.c
index 55706f8..798a3ff 100644
--- a/aio-posix.c
+++ b/aio-posix.c
@@ -264,6 +264,10 @@ bool aio_poll(AioContext *ctx, bool blocking)
/* Run dispatch even if there were no readable fds to run timers */
aio_set_dispatching(ctx, true);
+ if (aio_bh_poll(ctx)) {
+ progress = true;
+ }
+
if (aio_dispatch(ctx)) {
progress = true;
}
diff --git a/aio-win32.c b/aio-win32.c
index 5e37b42..2ac38a8 100644
--- a/aio-win32.c
+++ b/aio-win32.c
@@ -143,7 +143,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
{
AioHandler *node;
HANDLE events[MAXIMUM_WAIT_OBJECTS + 1];
- bool progress;
+ bool progress, first;
int count;
int timeout;
@@ -177,6 +177,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
}
ctx->walking_handlers--;
+ first = true;
/* wait until next event */
while (count > 0) {
@@ -186,6 +187,11 @@ bool aio_poll(AioContext *ctx, bool blocking)
? qemu_timeout_ns_to_ms(aio_compute_timeout(ctx)) : 0;
ret = WaitForMultipleObjects(count, events, FALSE, timeout);
+ if (first && aio_bh_poll(ctx)) {
+ progress = true;
+ }
+ first = false;
+
/* if we have any signaled events, dispatch event */
if ((DWORD) (ret - WAIT_OBJECT_0) >= count) {
break;
--
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 <=
- [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, 2014/07/09
- [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