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

aio / timers: aio_ctx_prepare sets timeout from AioContext timers

Browse Source 
Calculate the timeout in aio_ctx_prepare taking into account
the timers attached to the AioContext.

Alter aio_ctx_check similarly.

Signed-off-by: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Alex Bligh 2013-08-21 16:02:51 +01:00 committed by Stefan Hajnoczi
parent d5541d8680
commit 533a8cf350
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
async.c
View File

@ -150,7 +150,10 @@ aio_ctx_prepare(GSource *source, gint *timeout)
{ {
AioContext *ctx = (AioContext *) source; AioContext *ctx = (AioContext *) source;
QEMUBH *bh; QEMUBH *bh;
int deadline;
/* We assume there is no timeout already supplied */
*timeout = -1;
for (bh = ctx->first_bh; bh; bh = bh->next) { for (bh = ctx->first_bh; bh; bh = bh->next) {
if (!bh->deleted && bh->scheduled) { if (!bh->deleted && bh->scheduled) {
if (bh->idle) { if (bh->idle) {
@ -166,6 +169,14 @@ aio_ctx_prepare(GSource *source, gint *timeout)
} }
} }
deadline = qemu_timeout_ns_to_ms(timerlistgroup_deadline_ns(&ctx->tlg));
if (deadline == 0) {
*timeout = 0;
return true;
} else {
*timeout = qemu_soonest_timeout(*timeout, deadline);
}
return false; return false;
} }
@ -180,7 +191,7 @@ aio_ctx_check(GSource *source)
return true; return true;
} }
} }
return aio_pending(ctx); return aio_pending(ctx) || (timerlistgroup_deadline_ns(&ctx->tlg) == 0);
} }
static gboolean static gboolean