mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AioContext: run bottom halves after polling

Browse Source 
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 <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-07-09 11:53:04 +02:00 committed by Stefan Hajnoczi
parent a398dea34c
commit 3672fa5083
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
aio-posix.c
View File

@ -264,6 +264,10 @@ bool aio_poll(AioContext *ctx, bool blocking)
/* Run dispatch even if there were no readable fds to run timers */ /* Run dispatch even if there were no readable fds to run timers */
aio_set_dispatching(ctx, true); aio_set_dispatching(ctx, true);
if (aio_bh_poll(ctx)) {
progress = true;
}
if (aio_dispatch(ctx)) { if (aio_dispatch(ctx)) {
progress = true; progress = true;
} }

8
aio-win32.c
View File

@ -143,7 +143,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
{ {
AioHandler *node; AioHandler *node;
HANDLE events[MAXIMUM_WAIT_OBJECTS + 1]; HANDLE events[MAXIMUM_WAIT_OBJECTS + 1];
bool progress; bool progress, first;
int count; int count;
int timeout; int timeout;
@ -177,6 +177,7 @@ bool aio_poll(AioContext *ctx, bool blocking)
} }
ctx->walking_handlers--; ctx->walking_handlers--;
first = true;
/* wait until next event */ /* wait until next event */
while (count > 0) { while (count > 0) {
@ -186,6 +187,11 @@ bool aio_poll(AioContext *ctx, bool blocking)
? qemu_timeout_ns_to_ms(aio_compute_timeout(ctx)) : 0; ? qemu_timeout_ns_to_ms(aio_compute_timeout(ctx)) : 0;
ret = WaitForMultipleObjects(count, events, FALSE, timeout); 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 we have any signaled events, dispatch event */
if ((DWORD) (ret - WAIT_OBJECT_0) >= count) { if ((DWORD) (ret - WAIT_OBJECT_0) >= count) {
break; break;