Skip to content

Commit

Permalink
tests: cover aio_co_enter from a worker thread without BQL taken
Browse files Browse the repository at this point in the history
Add a testcase for the test fixed by commit 'async: the main AioContext
is only "current" if under the BQL.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Message-Id: <20210614110214.726722-1-pbonzini@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Vladimir Sementsov-Ogievskiy <vsementsov@virtuozzo.com>
Signed-off-by: Eric Blake <eblake@redhat.com>
  • Loading branch information
bonzini authored and ebblake committed Jun 15, 2021
1 parent c72bb9d commit d78fa4b
Showing 1 changed file with 37 additions and 0 deletions.
37 changes: 37 additions & 0 deletions tests/unit/test-aio.c
Expand Up @@ -877,6 +877,42 @@ static void test_queue_chaining(void)
g_assert_cmpint(data_b.i, ==, data_b.max);
}

static void co_check_current_thread(void *opaque)
{
QemuThread *main_thread = opaque;
assert(qemu_thread_is_self(main_thread));
}

static void *test_aio_co_enter(void *co)
{
/*
* qemu_get_current_aio_context() should not to be the main thread
* AioContext, because this is a worker thread that has not taken
* the BQL. So aio_co_enter will schedule the coroutine in the
* main thread AioContext.
*/
aio_co_enter(qemu_get_aio_context(), co);
return NULL;
}

static void test_worker_thread_co_enter(void)
{
QemuThread this_thread, worker_thread;
Coroutine *co;

qemu_thread_get_self(&this_thread);
co = qemu_coroutine_create(co_check_current_thread, &this_thread);

qemu_thread_create(&worker_thread, "test_acquire_thread",
test_aio_co_enter,
co, QEMU_THREAD_JOINABLE);

/* Test aio_co_enter from a worker thread. */
qemu_thread_join(&worker_thread);
g_assert(aio_poll(ctx, true));
g_assert(!aio_poll(ctx, false));
}

/* End of tests. */

int main(int argc, char **argv)
Expand All @@ -903,6 +939,7 @@ int main(int argc, char **argv)
g_test_add_func("/aio/timer/schedule", test_timer_schedule);

g_test_add_func("/aio/coroutine/queue-chaining", test_queue_chaining);
g_test_add_func("/aio/coroutine/worker-thread-co-enter", test_worker_thread_co_enter);

g_test_add_func("/aio-gsource/flush", test_source_flush);
g_test_add_func("/aio-gsource/bh/schedule", test_source_bh_schedule);
Expand Down

0 comments on commit d78fa4b

Please sign in to comment.