Update the iothread_get_aio_context and the iothread_put_aio_context for tests.
Signed-off-by: Zhang Chen <[email protected]> --- tests/unit/iothread.c | 16 ++++++++++------ tests/unit/iothread.h | 6 +++++- tests/unit/test-aio-multithread.c | 5 ++++- tests/unit/test-bdrv-drain.c | 18 +++++++++++++----- tests/unit/test-block-iothread.c | 21 ++++++++++++++------- 5 files changed, 46 insertions(+), 20 deletions(-) diff --git a/tests/unit/iothread.c b/tests/unit/iothread.c index a363bf8f70..6cac850035 100644 --- a/tests/unit/iothread.c +++ b/tests/unit/iothread.c @@ -30,12 +30,21 @@ struct IOThread { bool stopping; }; +AioContext *iothread_get_aio_context(IOThread *iothread, IOThreadHolder *holder) +{ + return iothread->ctx; +} + +void iothread_put_aio_context(IOThread *iothread, IOThreadHolder *holder) +{ +} + static void iothread_init_gcontext(IOThread *iothread) { GSource *source; iothread->worker_context = g_main_context_new(); - source = aio_get_g_source(iothread_get_aio_context(iothread)); + source = aio_get_g_source(iothread->ctx); g_source_attach(source, iothread->worker_context); g_source_unref(source); iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE); @@ -113,8 +122,3 @@ IOThread *iothread_new(void) qemu_mutex_unlock(&iothread->init_done_lock); return iothread; } - -AioContext *iothread_get_aio_context(IOThread *iothread) -{ - return iothread->ctx; -} diff --git a/tests/unit/iothread.h b/tests/unit/iothread.h index eb4d0c77f8..42992c171d 100644 --- a/tests/unit/iothread.h +++ b/tests/unit/iothread.h @@ -17,9 +17,13 @@ #include "qemu/thread.h" typedef struct IOThread IOThread; +typedef struct IOThreadHolder IOThreadHolder; + +AioContext *iothread_get_aio_context(IOThread *iothread, + IOThreadHolder *holder); +void iothread_put_aio_context(IOThread *iothread, IOThreadHolder *holder); IOThread *iothread_new(void); void iothread_join(IOThread *iothread); -AioContext *iothread_get_aio_context(IOThread *iothread); #endif diff --git a/tests/unit/test-aio-multithread.c b/tests/unit/test-aio-multithread.c index 9179cdc6a3..92fa210ddc 100644 --- a/tests/unit/test-aio-multithread.c +++ b/tests/unit/test-aio-multithread.c @@ -69,7 +69,7 @@ static void create_aio_contexts(void) for (i = 0; i < NUM_CONTEXTS; i++) { threads[i] = iothread_new(); - ctx[i] = iothread_get_aio_context(threads[i]); + ctx[i] = iothread_get_aio_context(threads[i], NULL); } qemu_event_init(&done_event, false); @@ -87,6 +87,9 @@ static void join_aio_contexts(void) for (i = 0; i < NUM_CONTEXTS; i++) { aio_context_ref(ctx[i]); } + for (i = 0; i < NUM_CONTEXTS; i++) { + iothread_put_aio_context(threads[i], NULL); + } for (i = 0; i < NUM_CONTEXTS; i++) { iothread_join(threads[i]); } diff --git a/tests/unit/test-bdrv-drain.c b/tests/unit/test-bdrv-drain.c index 43b0ba8648..05e52e89ac 100644 --- a/tests/unit/test-bdrv-drain.c +++ b/tests/unit/test-bdrv-drain.c @@ -537,8 +537,8 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread) IOThread *a = iothread_new(); IOThread *b = iothread_new(); - AioContext *ctx_a = iothread_get_aio_context(a); - AioContext *ctx_b = iothread_get_aio_context(b); + AioContext *ctx_a = iothread_get_aio_context(a, NULL); + AioContext *ctx_b = iothread_get_aio_context(b, NULL); QEMUIOVector qiov = QEMU_IOVEC_INIT_BUF(qiov, NULL, 0); @@ -612,6 +612,8 @@ static void test_iothread_common(enum drain_type drain_type, int drain_thread) bdrv_unref(bs); blk_unref(blk); + iothread_put_aio_context(a, NULL); + iothread_put_aio_context(b, NULL); out: iothread_join(a); @@ -762,7 +764,7 @@ static void test_blockjob_common_drain_node(enum drain_type drain_type, AioContext *ctx; iothread = iothread_new(); - ctx = iothread_get_aio_context(iothread); + ctx = iothread_get_aio_context(iothread, NULL); blk_set_aio_context(blk_src, ctx, &error_abort); } @@ -892,6 +894,10 @@ static void test_blockjob_common_drain_node(enum drain_type drain_type, bdrv_unref(src_overlay); bdrv_unref(target); + if (use_iothread) { + iothread_put_aio_context(iothread, NULL); + } + if (iothread) { iothread_join(iothread); } @@ -1398,8 +1404,8 @@ static void test_set_aio_context(void) BlockDriverState *bs; IOThread *a = iothread_new(); IOThread *b = iothread_new(); - AioContext *ctx_a = iothread_get_aio_context(a); - AioContext *ctx_b = iothread_get_aio_context(b); + AioContext *ctx_a = iothread_get_aio_context(a, NULL); + AioContext *ctx_b = iothread_get_aio_context(b, NULL); bs = bdrv_new_open_driver(&bdrv_test, "test-node", BDRV_O_RDWR, &error_abort); @@ -1410,6 +1416,8 @@ static void test_set_aio_context(void) bdrv_try_change_aio_context(bs, qemu_get_aio_context(), NULL, &error_abort); bdrv_unref(bs); + iothread_put_aio_context(a, NULL); + iothread_put_aio_context(b, NULL); iothread_join(a); iothread_join(b); } diff --git a/tests/unit/test-block-iothread.c b/tests/unit/test-block-iothread.c index 5273ff235a..8b7ac6f980 100644 --- a/tests/unit/test-block-iothread.c +++ b/tests/unit/test-block-iothread.c @@ -466,7 +466,7 @@ static void test_sync_op(const void *opaque) { const SyncOpTest *t = opaque; IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); BlockBackend *blk; BlockDriverState *bs; BdrvChild *c; @@ -493,6 +493,7 @@ static void test_sync_op(const void *opaque) bdrv_unref(bs); blk_unref(blk); + iothread_put_aio_context(iothread, NULL); } typedef struct TestBlockJob { @@ -549,7 +550,7 @@ BlockJobDriver test_job_driver = { static void test_attach_blockjob(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); BlockBackend *blk; BlockDriverState *bs; TestBlockJob *tjob; @@ -595,6 +596,7 @@ static void test_attach_blockjob(void) bdrv_unref(bs); blk_unref(blk); + iothread_put_aio_context(iothread, NULL); } /* @@ -612,7 +614,7 @@ static void test_attach_blockjob(void) static void test_propagate_basic(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); AioContext *main_ctx; BlockBackend *blk; BlockDriverState *bs_a, *bs_b, *bs_verify; @@ -658,6 +660,7 @@ static void test_propagate_basic(void) bdrv_unref(bs_b); bdrv_unref(bs_a); blk_unref(blk); + iothread_put_aio_context(iothread, NULL); } /* @@ -676,7 +679,7 @@ static void test_propagate_basic(void) static void test_propagate_diamond(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); AioContext *main_ctx; BlockBackend *blk; BlockDriverState *bs_a, *bs_b, *bs_c, *bs_verify; @@ -736,12 +739,13 @@ static void test_propagate_diamond(void) bdrv_unref(bs_c); bdrv_unref(bs_b); bdrv_unref(bs_a); + iothread_put_aio_context(iothread, NULL); } static void test_propagate_mirror(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); AioContext *main_ctx = qemu_get_aio_context(); BlockDriverState *src, *target, *filter; BlockBackend *blk; @@ -807,12 +811,13 @@ static void test_propagate_mirror(void) blk_unref(blk); bdrv_unref(src); bdrv_unref(target); + iothread_put_aio_context(iothread, NULL); } static void test_attach_second_node(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); AioContext *main_ctx = qemu_get_aio_context(); BlockBackend *blk; BlockDriverState *bs, *filter; @@ -840,12 +845,13 @@ static void test_attach_second_node(void) bdrv_unref(filter); bdrv_unref(bs); blk_unref(blk); + iothread_put_aio_context(iothread, NULL); } static void test_attach_preserve_blk_ctx(void) { IOThread *iothread = iothread_new(); - AioContext *ctx = iothread_get_aio_context(iothread); + AioContext *ctx = iothread_get_aio_context(iothread, NULL); BlockBackend *blk; BlockDriverState *bs; @@ -871,6 +877,7 @@ static void test_attach_preserve_blk_ctx(void) blk_set_aio_context(blk, qemu_get_aio_context(), &error_abort); bdrv_unref(bs); blk_unref(blk); + iothread_put_aio_context(iothread, NULL); } int main(int argc, char **argv) -- 2.49.0
