δΊ 2013-8-16 4:34, Alex Bligh ει: > 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 <a...@alex.org.uk> > --- > async.c | 13 +++++++++++-- > 1 file changed, 11 insertions(+), 2 deletions(-) > > diff --git a/async.c b/async.c > index 2b9ba9b..d8656cc 100644 > --- a/async.c > +++ b/async.c > @@ -150,13 +150,14 @@ aio_ctx_prepare(GSource *source, gint *timeout) > { > AioContext *ctx = (AioContext *) source; > QEMUBH *bh; > + int deadline; > > for (bh = ctx->first_bh; bh; bh = bh->next) { > if (!bh->deleted && bh->scheduled) { > if (bh->idle) { > /* idle bottom halves will be polled at least > * every 10ms */ > - *timeout = 10; > + *timeout = qemu_soonest_timeout(*timeout, 10); glib will not set *timeout to a meaningful value before calling aio_ctx_prepare(), right? If so, "*timeout = 10" should be used.
> } else { > /* non-idle bottom halves will be executed > * immediately */ > @@ -166,6 +167,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; > } > > @@ -180,7 +189,7 @@ aio_ctx_check(GSource *source) > return true; > } > } > - return aio_pending(ctx); > + return aio_pending(ctx) || (timerlistgroup_deadline_ns(&ctx->tlg) == 0); > } > > static gboolean > -- Best Regards Wenchao Xia