[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 21/28] aio: add a ThreadPool instance to AioContext
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PATCH 21/28] aio: add a ThreadPool instance to AioContext |
Date: |
Fri, 15 Mar 2013 16:14:18 +0100 |
This patch adds a ThreadPool to AioContext. It's possible that some
AioContext instances will never use the ThreadPool, so defer creation
until aio_get_thread_pool().
The reason why AioContext should have the ThreadPool is because the
ThreadPool is bound to a AioContext instance where the work item's
callback function is invoked. It doesn't make sense to keep the
ThreadPool pointer anywhere other than AioContext. For example,
block/raw-posix.c can get its AioContext's ThreadPool and submit work.
Special note about headers: I used struct ThreadPool in aio.h because
there is a circular dependency if aio.h includes thread-pool.h.
Signed-off-by: Stefan Hajnoczi <address@hidden>
Reviewed-by: Paolo Bonzini <address@hidden>
---
async.c | 11 +++++++++++
include/block/aio.h | 6 ++++++
2 files changed, 17 insertions(+)
diff --git a/async.c b/async.c
index f2d47ba..90fe906 100644
--- a/async.c
+++ b/async.c
@@ -24,6 +24,7 @@
#include "qemu-common.h"
#include "block/aio.h"
+#include "block/thread-pool.h"
#include "qemu/main-loop.h"
/***********************************************************/
@@ -172,6 +173,7 @@ aio_ctx_finalize(GSource *source)
{
AioContext *ctx = (AioContext *) source;
+ thread_pool_free(ctx->thread_pool);
aio_set_event_notifier(ctx, &ctx->notifier, NULL, NULL);
event_notifier_cleanup(&ctx->notifier);
g_array_free(ctx->pollfds, TRUE);
@@ -190,6 +192,14 @@ GSource *aio_get_g_source(AioContext *ctx)
return &ctx->source;
}
+ThreadPool *aio_get_thread_pool(AioContext *ctx)
+{
+ if (!ctx->thread_pool) {
+ ctx->thread_pool = thread_pool_new(ctx);
+ }
+ return ctx->thread_pool;
+}
+
void aio_notify(AioContext *ctx)
{
event_notifier_set(&ctx->notifier);
@@ -200,6 +210,7 @@ AioContext *aio_context_new(void)
AioContext *ctx;
ctx = (AioContext *) g_source_new(&aio_source_funcs, sizeof(AioContext));
ctx->pollfds = g_array_new(FALSE, FALSE, sizeof(GPollFD));
+ ctx->thread_pool = NULL;
event_notifier_init(&ctx->notifier, false);
aio_set_event_notifier(ctx, &ctx->notifier,
(EventNotifierHandler *)
diff --git a/include/block/aio.h b/include/block/aio.h
index 5b54d38..1836793 100644
--- a/include/block/aio.h
+++ b/include/block/aio.h
@@ -66,6 +66,9 @@ typedef struct AioContext {
/* GPollFDs for aio_poll() */
GArray *pollfds;
+
+ /* Thread pool for performing work and receiving completion callbacks */
+ struct ThreadPool *thread_pool;
} AioContext;
/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
@@ -223,6 +226,9 @@ void aio_set_event_notifier(AioContext *ctx,
*/
GSource *aio_get_g_source(AioContext *ctx);
+/* Return the ThreadPool bound to this AioContext */
+struct ThreadPool *aio_get_thread_pool(AioContext *ctx);
+
/* Functions to operate on the main QEMU AioContext. */
bool qemu_aio_wait(void);
--
1.8.1.4
- [Qemu-devel] [PATCH 06/28] blockdev: Keep a copy of DriveInfo.serial, (continued)
- [Qemu-devel] [PATCH 06/28] blockdev: Keep a copy of DriveInfo.serial, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 12/28] qcow2: flush in qcow2_update_snapshot_refcount(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 13/28] qcow2: drop flush in update_cluster_refcount(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 15/28] qcow2: make is_allocated return true for zero clusters, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 16/28] sheepdog: use non-blocking fd in coroutine context, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 17/28] sheepdog: set io_flush handler in do_co_req, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 19/28] threadpool: move globals into struct ThreadPool, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 20/28] threadpool: add thread_pool_new() and thread_pool_free(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 22/28] block: add bdrv_get_aio_context(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 18/28] main-loop: add qemu_get_aio_context(), Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 21/28] aio: add a ThreadPool instance to AioContext,
Stefan Hajnoczi <=
- [Qemu-devel] [PATCH 24/28] coroutine: use AioContext for CoQueue BH, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 25/28] dataplane: fix hang introduced by AioContext transition, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 26/28] qemu-iotests: add tests for rebasing zero clusters, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 28/28] blockdev: Fix up copyright and permission notice, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 27/28] qemu-iotests: use -nographic in test case 007, Stefan Hajnoczi, 2013/03/15
- [Qemu-devel] [PATCH 23/28] threadpool: drop global thread pool, Stefan Hajnoczi, 2013/03/15
- Re: [Qemu-devel] [PULL 00/28] Block patches, Anthony Liguori, 2013/03/15