From 56d2c3c60d92dc24690b2e93b5f6ec4716ea06fa Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Thu, 12 Jan 2017 19:07:55 +0100 Subject: [PATCH] aio-posix: split aio_dispatch_handlers out of aio_dispatch This simplifies the handling of dispatch_fds. Signed-off-by: Paolo Bonzini Reviewed-by: Fam Zheng Reviewed-by: Stefan Hajnoczi Message-id: 20170112180800.21085-6-pbonzini@redhat.com Signed-off-by: Stefan Hajnoczi --- aio-posix.c | 43 +++++++++++++++++++++++++------------------ 1 file changed, 25 insertions(+), 18 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 15855715d4..25198d9013 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -367,31 +367,16 @@ bool aio_pending(AioContext *ctx) return false; } -/* - * Note that dispatch_fds == false has the side-effect of post-poning the - * freeing of deleted handlers. - */ -bool aio_dispatch(AioContext *ctx, bool dispatch_fds) +static bool aio_dispatch_handlers(AioContext *ctx) { - AioHandler *node = NULL; + AioHandler *node; bool progress = false; /* - * If there are callbacks left that have been queued, we need to call them. - * Do not call select in this case, because it is possible that the caller - * does not need a complete flush (as is the case for aio_poll loops). - */ - if (aio_bh_poll(ctx)) { - progress = true; - } - - /* * We have to walk very carefully in case aio_set_fd_handler is * called while we're walking. */ - if (dispatch_fds) { - node = QLIST_FIRST(&ctx->aio_handlers); - } + node = QLIST_FIRST(&ctx->aio_handlers); while (node) { AioHandler *tmp; int revents; @@ -431,6 +416,28 @@ bool aio_dispatch(AioContext *ctx, bool dispatch_fds) } } + return progress; +} + +/* + * Note that dispatch_fds == false has the side-effect of post-poning the + * freeing of deleted handlers. + */ +bool aio_dispatch(AioContext *ctx, bool dispatch_fds) +{ + bool progress; + + /* + * If there are callbacks left that have been queued, we need to call them. + * Do not call select in this case, because it is possible that the caller + * does not need a complete flush (as is the case for aio_poll loops). + */ + progress = aio_bh_poll(ctx); + + if (dispatch_fds) { + progress |= aio_dispatch_handlers(ctx); + } + /* Run our timers */ progress |= timerlistgroup_run_timers(&ctx->tlg); -- 2.11.4.GIT