Commit dae21b98 authored by Alex Bligh's avatar Alex Bligh Committed by Stefan Hajnoczi
Browse files

aio / timers: Add QEMUTimerListGroup to AioContext 



Add a QEMUTimerListGroup each AioContext (meaning a QEMUTimerList
associated with each clock is added) and delete it when the
AioContext is freed.

Signed-off-by: default avatarAlex Bligh <alex@alex.org.uk>
Signed-off-by: default avatarStefan Hajnoczi <stefanha@redhat.com>
parent 754d6a54

async.c

+2 −0
Original line number Diff line number Diff line
@@ -205,6 +205,7 @@ aio_ctx_finalize(GSource *source) 
    event_notifier_cleanup(&ctx->notifier);

    qemu_mutex_destroy(&ctx->bh_lock);

    g_array_free(ctx->pollfds, TRUE);

    timerlistgroup_deinit(&ctx->tlg);

}



static GSourceFuncs aio_source_funcs = {
@@ -244,6 +245,7 @@ AioContext *aio_context_new(void) 
    aio_set_event_notifier(ctx, &ctx->notifier, 

                           (EventNotifierHandler *)

                           event_notifier_test_and_clear);

    timerlistgroup_init(&ctx->tlg);



    return ctx;

}

include/block/aio.h

+4 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "qemu/queue.h"

#include "qemu/event_notifier.h"

#include "qemu/thread.h"

#include "qemu/timer.h"



typedef struct BlockDriverAIOCB BlockDriverAIOCB;

typedef void BlockDriverCompletionFunc(void *opaque, int ret);
@@ -73,6 +74,9 @@ struct AioContext { 


    /* Thread pool for performing work and receiving completion callbacks */

    struct ThreadPool *thread_pool;



    /* TimerLists for calling timers - one per clock type */

    QEMUTimerListGroup tlg;

};



/**

tests/test-aio.c

+3 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 


#include <glib.h>

#include "block/aio.h"

#include "qemu/timer.h"



AioContext *ctx;
@@ -630,6 +631,8 @@ int main(int argc, char **argv) 
{

    GSource *src;



    init_clocks();



    ctx = aio_context_new();

    src = aio_get_g_source(ctx);

    g_source_attach(src, NULL);

tests/test-thread-pool.c

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ 
#include "block/aio.h"

#include "block/thread-pool.h"

#include "block/block.h"

#include "qemu/timer.h"



static AioContext *ctx;

static ThreadPool *pool;
@@ -205,6 +206,8 @@ int main(int argc, char **argv) 
{

    int ret;



    init_clocks();



    ctx = aio_context_new();

    pool = aio_get_thread_pool(ctx);