Commit 56d2c3c6 authored by Paolo Bonzini's avatar Paolo Bonzini Committed by Stefan Hajnoczi
Browse files

aio-posix: split aio_dispatch_handlers out of aio_dispatch 



This simplifies the handling of dispatch_fds.

Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
Reviewed-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
Message-id: 20170112180800.21085-6-pbonzini@redhat.com
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent fbcc3e50

aio-posix.c

+25 −18
Original line number Diff line number Diff line
@@ -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);

    }

    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);