[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC] [PATCHv4 06/13] aio / timers: Add a QEMUTimerList to
From: |
Alex Bligh |
Subject: |
[Qemu-devel] [RFC] [PATCHv4 06/13] aio / timers: Add a QEMUTimerList to AioContext |
Date: |
Fri, 26 Jul 2013 19:37:35 +0100 |
Add a QEMUTimerList to each AioContext and delete it when the
AioContext is freed.
Signed-off-by: Alex Bligh <address@hidden>
---
async.c | 7 +++++++
include/block/aio.h | 5 +++++
tests/test-aio.c | 3 +++
tests/test-thread-pool.c | 3 +++
4 files changed, 18 insertions(+)
diff --git a/async.c b/async.c
index 90fe906..8acbd4c 100644
--- a/async.c
+++ b/async.c
@@ -177,6 +177,7 @@ aio_ctx_finalize(GSource *source)
aio_set_event_notifier(ctx, &ctx->notifier, NULL, NULL);
event_notifier_cleanup(&ctx->notifier);
g_array_free(ctx->pollfds, TRUE);
+ qemu_free_timerlist(ctx->tl);
}
static GSourceFuncs aio_source_funcs = {
@@ -215,6 +216,12 @@ AioContext *aio_context_new(void)
aio_set_event_notifier(ctx, &ctx->notifier,
(EventNotifierHandler *)
event_notifier_test_and_clear, NULL);
+ /* Assert if we don't have rt_clock yet. If you see this assertion
+ * it means you are using AioContext without having first called
+ * init_clocks() in main().
+ */
+ assert(rt_clock);
+ ctx->tl = qemu_new_timerlist(rt_clock);
return ctx;
}
diff --git a/include/block/aio.h b/include/block/aio.h
index 1836793..1595167 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -41,6 +41,8 @@ typedef struct AioHandler AioHandler;
typedef void QEMUBHFunc(void *opaque);
typedef void IOHandler(void *opaque);
+typedef struct QEMUTimerList QEMUTimerList;
+
typedef struct AioContext {
GSource source;
@@ -69,6 +71,9 @@ typedef struct AioContext {
/* Thread pool for performing work and receiving completion callbacks */
struct ThreadPool *thread_pool;
+
+ /* TimerList for calling timers */
+ QEMUTimerList *tl;
} AioContext;
/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
diff --git a/tests/test-aio.c b/tests/test-aio.c
index c173870..2d7ec4c 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -12,6 +12,7 @@
#include <glib.h>
#include "block/aio.h"
+#include "qemu/timer.h"
AioContext *ctx;
@@ -628,6 +629,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);
diff --git a/tests/test-thread-pool.c b/tests/test-thread-pool.c
index b62338f..27d6190 100644
--- a/tests/test-thread-pool.c
+++ b/tests/test-thread-pool.c
@@ -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);
--
1.7.9.5
- [Qemu-devel] [RFC] [PATCHv3 10/12] aio / timers: on timer modification, qemu_notify or aio_notify, (continued)
- [Qemu-devel] [RFC] [PATCHv3 10/12] aio / timers: on timer modification, qemu_notify or aio_notify, Alex Bligh, 2013/07/25
- [Qemu-devel] [RFC] [PATCHv3 09/12] aio / timers: convert mainloop to use timeout, Alex Bligh, 2013/07/25
- [Qemu-devel] [RFC] [PATCHv3 12/12] aio / timers: Add test harness for AioContext timers, Alex Bligh, 2013/07/25
- [Qemu-devel] [RFC] [PATCHv3 11/12] aio / timers: Remove alarm timers, Alex Bligh, 2013/07/25
- Re: [Qemu-devel] [RFC] [PATCHv3 00/12] aio / timers: Add AioContext timers and use ppoll, Alex Bligh, 2013/07/25
- [Qemu-devel] [RFC] [PATCHv4 00/13] aio / timers: Add AioContext timers and use ppoll, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 03/13] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 01/13] aio / timers: add qemu-timer.c utility functions, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 04/13] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 02/13] aio / timers: add ppoll support with qemu_poll_ns, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 06/13] aio / timers: Add a QEMUTimerList to AioContext,
Alex Bligh <=
- [Qemu-devel] [RFC] [PATCHv4 08/13] aio / timers: aio_ctx_prepare sets timeout from AioContext timers, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 07/13] aio / timers: Add an AioContext pointer to QEMUTimerList, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 11/13] aio / timers: on timer modification, qemu_notify or aio_notify, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 09/13] aio / timers: Convert aio_poll to use AioContext timers' deadline, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 10/13] aio / timers: Convert mainloop to use timeout, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 05/13] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 12/13] aio / timers: Remove alarm timers, Alex Bligh, 2013/07/26
- [Qemu-devel] [RFC] [PATCHv4 13/13] aio / timers: Add test harness for AioContext timers, Alex Bligh, 2013/07/26