Commit dca21ef2 authored by Fam Zheng's avatar Fam Zheng Committed by Kevin Wolf
Browse files

aio: Add "is_external" flag for event handlers 



All callers pass in false, and the real external ones will switch to
true in coming patches.

Signed-off-by: default avatarFam Zheng <famz@redhat.com>
Reviewed-by: default avatarJeff Cody <jcody@redhat.com>
Reviewed-by: default avatarKevin Wolf <kwolf@redhat.com>
Signed-off-by: default avatarKevin Wolf <kwolf@redhat.com>
parent d87d01e1

aio-posix.c

+5 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ struct AioHandler 
    IOHandler *io_write;

    int deleted;

    void *opaque;

    bool is_external;

    QLIST_ENTRY(AioHandler) node;

};
@@ -43,6 +44,7 @@ static AioHandler *find_aio_handler(AioContext *ctx, int fd) 


void aio_set_fd_handler(AioContext *ctx,

                        int fd,

                        bool is_external,

                        IOHandler *io_read,

                        IOHandler *io_write,

                        void *opaque)
@@ -82,6 +84,7 @@ void aio_set_fd_handler(AioContext *ctx, 
        node->io_read = io_read;

        node->io_write = io_write;

        node->opaque = opaque;

        node->is_external = is_external;



        node->pfd.events = (io_read ? G_IO_IN | G_IO_HUP | G_IO_ERR : 0);

        node->pfd.events |= (io_write ? G_IO_OUT | G_IO_ERR : 0);
@@ -92,10 +95,11 @@ void aio_set_fd_handler(AioContext *ctx, 


void aio_set_event_notifier(AioContext *ctx,

                            EventNotifier *notifier,

                            bool is_external,

                            EventNotifierHandler *io_read)

{

    aio_set_fd_handler(ctx, event_notifier_get_fd(notifier),

                       (IOHandler *)io_read, NULL, notifier);

                       is_external, (IOHandler *)io_read, NULL, notifier);

}



bool aio_prepare(AioContext *ctx)

aio-win32.c

+5 −0
Original line number Diff line number Diff line
@@ -28,11 +28,13 @@ struct AioHandler { 
    GPollFD pfd;

    int deleted;

    void *opaque;

    bool is_external;

    QLIST_ENTRY(AioHandler) node;

};



void aio_set_fd_handler(AioContext *ctx,

                        int fd,

                        bool is_external,

                        IOHandler *io_read,

                        IOHandler *io_write,

                        void *opaque)
@@ -86,6 +88,7 @@ void aio_set_fd_handler(AioContext *ctx, 
        node->opaque = opaque;

        node->io_read = io_read;

        node->io_write = io_write;

        node->is_external = is_external;



        event = event_notifier_get_handle(&ctx->notifier);

        WSAEventSelect(node->pfd.fd, event,
@@ -98,6 +101,7 @@ void aio_set_fd_handler(AioContext *ctx, 


void aio_set_event_notifier(AioContext *ctx,

                            EventNotifier *e,

                            bool is_external,

                            EventNotifierHandler *io_notify)

{

    AioHandler *node;
@@ -133,6 +137,7 @@ void aio_set_event_notifier(AioContext *ctx, 
            node->e = e;

            node->pfd.fd = (uintptr_t)event_notifier_get_handle(e);

            node->pfd.events = G_IO_IN;

            node->is_external = is_external;

            QLIST_INSERT_HEAD(&ctx->aio_handlers, node, node);



            g_source_add_poll(&ctx->source, &node->pfd);

async.c

+2 −1
Original line number Diff line number Diff line
@@ -247,7 +247,7 @@ aio_ctx_finalize(GSource *source) 
    }

    qemu_mutex_unlock(&ctx->bh_lock);



    aio_set_event_notifier(ctx, &ctx->notifier, NULL);

    aio_set_event_notifier(ctx, &ctx->notifier, false, NULL);

    event_notifier_cleanup(&ctx->notifier);

    rfifolock_destroy(&ctx->lock);

    qemu_mutex_destroy(&ctx->bh_lock);
@@ -329,6 +329,7 @@ AioContext *aio_context_new(Error **errp) 
    }

    g_source_set_can_recurse(&ctx->source, true);

    aio_set_event_notifier(ctx, &ctx->notifier,

                           false,

                           (EventNotifierHandler *)

                           event_notifier_dummy_cb);

    ctx->thread_pool = NULL;

block/curl.c

+8 −6
Original line number Diff line number Diff line
@@ -154,18 +154,20 @@ static int curl_sock_cb(CURL *curl, curl_socket_t fd, int action, 
    DPRINTF("CURL (AIO): Sock action %d on fd %d\n", action, fd);

    switch (action) {

        case CURL_POLL_IN:

            aio_set_fd_handler(s->aio_context, fd, curl_multi_read,

                               NULL, state);

            aio_set_fd_handler(s->aio_context, fd, false,

                               curl_multi_read, NULL, state);

            break;

        case CURL_POLL_OUT:

            aio_set_fd_handler(s->aio_context, fd, NULL, curl_multi_do, state);

            aio_set_fd_handler(s->aio_context, fd, false,

                               NULL, curl_multi_do, state);

            break;

        case CURL_POLL_INOUT:

            aio_set_fd_handler(s->aio_context, fd, curl_multi_read,

                               curl_multi_do, state);

            aio_set_fd_handler(s->aio_context, fd, false,

                               curl_multi_read, curl_multi_do, state);

            break;

        case CURL_POLL_REMOVE:

            aio_set_fd_handler(s->aio_context, fd, NULL, NULL, NULL);

            aio_set_fd_handler(s->aio_context, fd, false,

                               NULL, NULL, NULL);

            break;

    }

block/iscsi.c

+4 −5
Original line number Diff line number Diff line
@@ -291,8 +291,8 @@ iscsi_set_events(IscsiLun *iscsilun) 
    int ev = iscsi_which_events(iscsi);



    if (ev != iscsilun->events) {

        aio_set_fd_handler(iscsilun->aio_context,

                           iscsi_get_fd(iscsi),

        aio_set_fd_handler(iscsilun->aio_context, iscsi_get_fd(iscsi),

                           false,

                           (ev & POLLIN) ? iscsi_process_read : NULL,

                           (ev & POLLOUT) ? iscsi_process_write : NULL,

                           iscsilun);
@@ -1280,9 +1280,8 @@ static void iscsi_detach_aio_context(BlockDriverState *bs) 
{

    IscsiLun *iscsilun = bs->opaque;



    aio_set_fd_handler(iscsilun->aio_context,

                       iscsi_get_fd(iscsilun->iscsi),

                       NULL, NULL, NULL);

    aio_set_fd_handler(iscsilun->aio_context, iscsi_get_fd(iscsilun->iscsi),

                       false, NULL, NULL, NULL);

    iscsilun->events = 0;



    if (iscsilun->nop_timer) {