ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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: Alex Bligh <alex@alex.org.uk>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Alex Bligh 2013-08-21 16:02:49 +01:00 committed by Stefan Hajnoczi
parent 754d6a544d
commit dae21b98b9
4 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
async.c
View File

@ -205,6 +205,7 @@ aio_ctx_finalize(GSource *source)
event_notifier_cleanup(&ctx->notifier); event_notifier_cleanup(&ctx->notifier);
qemu_mutex_destroy(&ctx->bh_lock); qemu_mutex_destroy(&ctx->bh_lock);
g_array_free(ctx->pollfds, TRUE); g_array_free(ctx->pollfds, TRUE);
timerlistgroup_deinit(&ctx->tlg);
} }
static GSourceFuncs aio_source_funcs = { static GSourceFuncs aio_source_funcs = {
@ -244,6 +245,7 @@ AioContext *aio_context_new(void)
aio_set_event_notifier(ctx, &ctx->notifier, aio_set_event_notifier(ctx, &ctx->notifier,
(EventNotifierHandler *) (EventNotifierHandler *)
event_notifier_test_and_clear); event_notifier_test_and_clear);
timerlistgroup_init(&ctx->tlg);
return ctx; return ctx;
} }

4
include/block/aio.h
View File

@ -19,6 +19,7 @@
#include "qemu/queue.h" #include "qemu/queue.h"
#include "qemu/event_notifier.h" #include "qemu/event_notifier.h"
#include "qemu/thread.h" #include "qemu/thread.h"
#include "qemu/timer.h"
typedef struct BlockDriverAIOCB BlockDriverAIOCB; typedef struct BlockDriverAIOCB BlockDriverAIOCB;
typedef void BlockDriverCompletionFunc(void *opaque, int ret); typedef void BlockDriverCompletionFunc(void *opaque, int ret);
@ -73,6 +74,9 @@ struct AioContext {
/* Thread pool for performing work and receiving completion callbacks */ /* Thread pool for performing work and receiving completion callbacks */
struct ThreadPool *thread_pool; struct ThreadPool *thread_pool;
/* TimerLists for calling timers - one per clock type */
QEMUTimerListGroup tlg;
}; };
/** /**

3
tests/test-aio.c
View File

@ -12,6 +12,7 @@
#include <glib.h> #include <glib.h>
#include "block/aio.h" #include "block/aio.h"
#include "qemu/timer.h"
AioContext *ctx; AioContext *ctx;
@ -630,6 +631,8 @@ int main(int argc, char **argv)
{ {
GSource *src; GSource *src;
init_clocks();
ctx = aio_context_new(); ctx = aio_context_new();
src = aio_get_g_source(ctx); src = aio_get_g_source(ctx);
g_source_attach(src, NULL); g_source_attach(src, NULL);

3
tests/test-thread-pool.c
View File

@ -3,6 +3,7 @@
#include "block/aio.h" #include "block/aio.h"
#include "block/thread-pool.h" #include "block/thread-pool.h"
#include "block/block.h" #include "block/block.h"
#include "qemu/timer.h"
static AioContext *ctx; static AioContext *ctx;
static ThreadPool *pool; static ThreadPool *pool;
@ -205,6 +206,8 @@ int main(int argc, char **argv)
{ {
int ret; int ret;
init_clocks();
ctx = aio_context_new(); ctx = aio_context_new();
pool = aio_get_thread_pool(ctx); pool = aio_get_thread_pool(ctx);