openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

test-aio: test timers on Windows too 

Use EventNotifier instead of a pipe, which makes it trivial to test
timers on Windows.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Paolo Bonzini 2014-07-09 11:53:06 +02:00 committed by Stefan Hajnoczi
parent e4c7e2d12d
commit 363285d4b3
1 changed files with 11 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
tests/test-aio.c
View File

@ -57,8 +57,6 @@ static void bh_test_cb(void *opaque)
} }
} }
#if !defined(_WIN32)
static void timer_test_cb(void *opaque) static void timer_test_cb(void *opaque)
{ {
TimerTestData *data = opaque; TimerTestData *data = opaque;
@ -68,12 +66,10 @@ static void timer_test_cb(void *opaque)
} }
} }
static void dummy_io_handler_read(void *opaque) static void dummy_io_handler_read(EventNotifier *e)
{ {
} }
#endif /* !_WIN32 */
static void bh_delete_cb(void *opaque) static void bh_delete_cb(void *opaque)
{ {
BHTestData *data = opaque; BHTestData *data = opaque;
@ -428,24 +424,18 @@ static void test_wait_event_notifier_noflush(void)
event_notifier_cleanup(&data.e); event_notifier_cleanup(&data.e);
} }
#if !defined(_WIN32)
static void test_timer_schedule(void) static void test_timer_schedule(void)
{ {
TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL, TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
.max = 2, .max = 2,
.clock_type = QEMU_CLOCK_VIRTUAL }; .clock_type = QEMU_CLOCK_VIRTUAL };
int pipefd[2]; EventNotifier e;
/* aio_poll will not block to wait for timers to complete unless it has /* aio_poll will not block to wait for timers to complete unless it has
* an fd to wait on. Fixing this breaks other tests. So create a dummy one. * an fd to wait on. Fixing this breaks other tests. So create a dummy one.
*/ */
g_assert(!qemu_pipe(pipefd)); event_notifier_init(&e, false);
qemu_set_nonblock(pipefd[0]); aio_set_event_notifier(ctx, &e, dummy_io_handler_read);
qemu_set_nonblock(pipefd[1]);
aio_set_fd_handler(ctx, pipefd[0],
dummy_io_handler_read, NULL, NULL);
aio_poll(ctx, false); aio_poll(ctx, false);
aio_timer_init(ctx, &data.timer, data.clock_type, aio_timer_init(ctx, &data.timer, data.clock_type,
@ -484,15 +474,12 @@ static void test_timer_schedule(void)
g_assert(!aio_poll(ctx, false)); g_assert(!aio_poll(ctx, false));
g_assert_cmpint(data.n, ==, 2); g_assert_cmpint(data.n, ==, 2);
aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL); aio_set_event_notifier(ctx, &e, NULL);
close(pipefd[0]); event_notifier_cleanup(&e);
close(pipefd[1]);
timer_del(&data.timer); timer_del(&data.timer);
} }
#endif /* !_WIN32 */
/* Now the same tests, using the context as a GSource. They are /* Now the same tests, using the context as a GSource. They are
* very similar to the ones above, with g_main_context_iteration * very similar to the ones above, with g_main_context_iteration
* replacing aio_poll. However: * replacing aio_poll. However:
@ -775,25 +762,19 @@ static void test_source_wait_event_notifier_noflush(void)
event_notifier_cleanup(&data.e); event_notifier_cleanup(&data.e);
} }
#if !defined(_WIN32)
static void test_source_timer_schedule(void) static void test_source_timer_schedule(void)
{ {
TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL, TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
.max = 2, .max = 2,
.clock_type = QEMU_CLOCK_VIRTUAL }; .clock_type = QEMU_CLOCK_VIRTUAL };
int pipefd[2]; EventNotifier e;
int64_t expiry; int64_t expiry;
/* aio_poll will not block to wait for timers to complete unless it has /* aio_poll will not block to wait for timers to complete unless it has
* an fd to wait on. Fixing this breaks other tests. So create a dummy one. * an fd to wait on. Fixing this breaks other tests. So create a dummy one.
*/ */
g_assert(!qemu_pipe(pipefd)); event_notifier_init(&e, false);
qemu_set_nonblock(pipefd[0]); aio_set_event_notifier(ctx, &e, dummy_io_handler_read);
qemu_set_nonblock(pipefd[1]);
aio_set_fd_handler(ctx, pipefd[0],
dummy_io_handler_read, NULL, NULL);
do {} while (g_main_context_iteration(NULL, false)); do {} while (g_main_context_iteration(NULL, false));
aio_timer_init(ctx, &data.timer, data.clock_type, aio_timer_init(ctx, &data.timer, data.clock_type,
@ -818,15 +799,12 @@ static void test_source_timer_schedule(void)
g_assert_cmpint(data.n, ==, 2); g_assert_cmpint(data.n, ==, 2);
g_assert(qemu_clock_get_ns(data.clock_type) > expiry); g_assert(qemu_clock_get_ns(data.clock_type) > expiry);
aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL); aio_set_event_notifier(ctx, &e, NULL);
close(pipefd[0]); event_notifier_cleanup(&e);
close(pipefd[1]);
timer_del(&data.timer); timer_del(&data.timer);
} }
#endif /* !_WIN32 */
/* End of tests. */ /* End of tests. */
@ -857,9 +835,7 @@ int main(int argc, char **argv)
g_test_add_func("/aio/event/wait", test_wait_event_notifier); g_test_add_func("/aio/event/wait", test_wait_event_notifier);
g_test_add_func("/aio/event/wait/no-flush-cb", test_wait_event_notifier_noflush); g_test_add_func("/aio/event/wait/no-flush-cb", test_wait_event_notifier_noflush);
g_test_add_func("/aio/event/flush", test_flush_event_notifier); g_test_add_func("/aio/event/flush", test_flush_event_notifier);
#if !defined(_WIN32)
g_test_add_func("/aio/timer/schedule", test_timer_schedule); g_test_add_func("/aio/timer/schedule", test_timer_schedule);
#endif
g_test_add_func("/aio-gsource/notify", test_source_notify); g_test_add_func("/aio-gsource/notify", test_source_notify);
g_test_add_func("/aio-gsource/flush", test_source_flush); g_test_add_func("/aio-gsource/flush", test_source_flush);
@ -874,8 +850,6 @@ int main(int argc, char **argv)
g_test_add_func("/aio-gsource/event/wait", test_source_wait_event_notifier); g_test_add_func("/aio-gsource/event/wait", test_source_wait_event_notifier);
g_test_add_func("/aio-gsource/event/wait/no-flush-cb", test_source_wait_event_notifier_noflush); g_test_add_func("/aio-gsource/event/wait/no-flush-cb", test_source_wait_event_notifier_noflush);
g_test_add_func("/aio-gsource/event/flush", test_source_flush_event_notifier); g_test_add_func("/aio-gsource/event/flush", test_source_flush_event_notifier);
#if !defined(_WIN32)
g_test_add_func("/aio-gsource/timer/schedule", test_source_timer_schedule); g_test_add_func("/aio-gsource/timer/schedule", test_source_timer_schedule);
#endif
return g_test_run(); return g_test_run();
} }