From: Alex Bligh <alex@alex.org.uk>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>,
Anthony Liguori <aliguori@us.ibm.com>,
Alex Bligh <alex@alex.org.uk>,
Jan Kiszka <jan.kiszka@siemens.com>,
liu ping fan <qemulist@gmail.com>,
Stefan Hajnoczi <stefanha@redhat.com>,
Paolo Bonzini <pbonzini@redhat.com>,
MORITA Kazutaka <morita.kazutaka@lab.ntt.co.jp>,
rth@twiddle.net
Subject: [Qemu-devel] [PATCHv11 28/31] aio / timers: Add test harness for AioContext timers
Date: Thu, 15 Aug 2013 21:34:36 +0100 [thread overview]
Message-ID: <1376598879-18976-29-git-send-email-alex@alex.org.uk> (raw)
In-Reply-To: <1376598879-18976-1-git-send-email-alex@alex.org.uk>
Add a test harness for AioContext timers. The g_source equivalent is
unsatisfactory as it suffers from false wakeups.
Signed-off-by: Alex Bligh <alex@alex.org.uk>
---
tests/test-aio.c | 136 ++++++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 136 insertions(+)
diff --git a/tests/test-aio.c b/tests/test-aio.c
index eedf7f8..f751543 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -32,6 +32,15 @@ typedef struct {
int max;
} BHTestData;
+typedef struct {
+ QEMUTimer timer;
+ QEMUClockType clock_type;
+ int n;
+ int max;
+ int64_t ns;
+ AioContext *ctx;
+} TimerTestData;
+
static void bh_test_cb(void *opaque)
{
BHTestData *data = opaque;
@@ -40,6 +49,24 @@ static void bh_test_cb(void *opaque)
}
}
+static void timer_test_cb(void *opaque)
+{
+ TimerTestData *data = opaque;
+ if (++data->n < data->max) {
+ timer_mod(&data->timer,
+ qemu_clock_get_ns(data->clock_type) + data->ns);
+ }
+}
+
+static void dummy_io_handler_read(void *opaque)
+{
+}
+
+static int dummy_io_handler_flush(void *opaque)
+{
+ return 1;
+}
+
static void bh_delete_cb(void *opaque)
{
BHTestData *data = opaque;
@@ -341,6 +368,65 @@ static void test_wait_event_notifier_noflush(void)
event_notifier_cleanup(&data.e);
}
+static void test_timer_schedule(void)
+{
+ TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
+ .max = 2,
+ .clock_type = QEMU_CLOCK_VIRTUAL };
+ int pipefd[2];
+
+ /* 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.
+ */
+ g_assert(!pipe2(pipefd, O_NONBLOCK));
+ aio_set_fd_handler(ctx, pipefd[0],
+ dummy_io_handler_read, NULL, dummy_io_handler_flush,
+ NULL);
+ aio_poll(ctx, false);
+
+ aio_timer_init(ctx, &data.timer, data.clock_type,
+ SCALE_NS, timer_test_cb, &data);
+ timer_mod(&data.timer,
+ qemu_clock_get_ns(data.clock_type) +
+ data.ns);
+
+ g_assert_cmpint(data.n, ==, 0);
+
+ /* timer_mod may well cause an event notifer to have gone off,
+ * so clear that
+ */
+ do {} while (aio_poll(ctx, false));
+
+ g_assert(!aio_poll(ctx, false));
+ g_assert_cmpint(data.n, ==, 0);
+
+ sleep(1);
+ g_assert_cmpint(data.n, ==, 0);
+
+ g_assert(aio_poll(ctx, false));
+ g_assert_cmpint(data.n, ==, 1);
+
+ /* timer_mod called by our callback */
+ do {} while (aio_poll(ctx, false));
+
+ g_assert(!aio_poll(ctx, false));
+ g_assert_cmpint(data.n, ==, 1);
+
+ g_assert(aio_poll(ctx, true));
+ g_assert_cmpint(data.n, ==, 2);
+
+ /* As max is now 2, an event notifier should not have gone off */
+
+ g_assert(!aio_poll(ctx, false));
+ g_assert_cmpint(data.n, ==, 2);
+
+ aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL, NULL);
+ close(pipefd[0]);
+ close(pipefd[1]);
+
+ timer_del(&data.timer);
+}
+
/* Now the same tests, using the context as a GSource. They are
* very similar to the ones above, with g_main_context_iteration
* replacing aio_poll. However:
@@ -623,6 +709,54 @@ static void test_source_wait_event_notifier_noflush(void)
event_notifier_cleanup(&data.e);
}
+static void test_source_timer_schedule(void)
+{
+ TimerTestData data = { .n = 0, .ctx = ctx, .ns = SCALE_MS * 750LL,
+ .max = 2,
+ .clock_type = QEMU_CLOCK_VIRTUAL };
+ int pipefd[2];
+ int64_t expiry;
+
+ /* 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.
+ */
+ g_assert(!pipe2(pipefd, O_NONBLOCK));
+ aio_set_fd_handler(ctx, pipefd[0],
+ dummy_io_handler_read, NULL, dummy_io_handler_flush,
+ NULL);
+ do {} while (g_main_context_iteration(NULL, false));
+
+ aio_timer_init(ctx, &data.timer, data.clock_type,
+ SCALE_NS, timer_test_cb, &data);
+ expiry = qemu_clock_get_ns(data.clock_type) +
+ data.ns;
+ timer_mod(&data.timer, expiry);
+
+ g_assert_cmpint(data.n, ==, 0);
+
+ sleep(1);
+ g_assert_cmpint(data.n, ==, 0);
+
+ g_assert(g_main_context_iteration(NULL, false));
+ g_assert_cmpint(data.n, ==, 1);
+
+ /* The comment above was not kidding when it said this wakes up itself */
+ do {
+ g_assert(g_main_context_iteration(NULL, true));
+ } while (qemu_clock_get_ns(data.clock_type) <= expiry);
+ sleep(1);
+ g_main_context_iteration(NULL, false);
+
+ g_assert_cmpint(data.n, ==, 2);
+
+ aio_set_fd_handler(ctx, pipefd[0], NULL, NULL, NULL, NULL);
+ close(pipefd[0]);
+ close(pipefd[1]);
+
+ timer_del(&data.timer);
+}
+
+
/* End of tests. */
int main(int argc, char **argv)
@@ -651,6 +785,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/no-flush-cb", test_wait_event_notifier_noflush);
g_test_add_func("/aio/event/flush", test_flush_event_notifier);
+ g_test_add_func("/aio/timer/schedule", test_timer_schedule);
g_test_add_func("/aio-gsource/notify", test_source_notify);
g_test_add_func("/aio-gsource/flush", test_source_flush);
@@ -665,5 +800,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/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/timer/schedule", test_source_timer_schedule);
return g_test_run();
}
--
1.7.9.5
next prev parent reply other threads:[~2013-08-15 20:35 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-08-15 20:34 [Qemu-devel] [PATCHv11 00/31] aio / timers: Add AioContext timers and use ppoll Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 01/31] aio / timers: Rename qemu_timer_* functions Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 02/31] aio / timers: Rename qemu_new_clock and expose clock types Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 03/31] aio / timers: add qemu-timer.c utility functions Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 04/31] aio / timers: Consistent treatment of disabled clocks for deadlines Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 05/31] aio / timers: add ppoll support with qemu_poll_ns Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 06/31] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 07/31] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 08/31] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 09/31] aio / timers: Untangle include files Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 10/31] aio / timers: Add QEMUTimerListGroup and helper functions Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 11/31] aio / timers: Add QEMUTimerListGroup to AioContext Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 12/31] aio / timers: Add a notify callback to QEMUTimerList Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 13/31] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Alex Bligh
2013-08-20 3:08 ` Wenchao Xia
2013-08-20 6:48 ` Alex Bligh
2013-08-20 7:19 ` Wenchao Xia
2013-08-20 9:29 ` Alex Bligh
2013-08-20 11:19 ` Wenchao Xia
2013-08-20 13:35 ` Alex Bligh
2013-08-21 9:01 ` Stefan Hajnoczi
2013-08-21 10:07 ` Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 14/31] aio / timers: Add aio_timer_init & aio_timer_new wrappers Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 15/31] aio / timers: Convert aio_poll to use AioContext timers' deadline Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 16/31] aio / timers: Convert mainloop to use timeout Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 17/31] aio / timers: On timer modification, qemu_notify or aio_notify Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 18/31] aio / timers: Introduce new API timer_new and friends Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 19/31] aio / timers: Use all timerlists in icount warp calculations Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 20/31] aio / timers: Add documentation and new format calls Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 21/31] aio / timers: Remove alarm timers Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 22/31] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 23/31] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 24/31] aio / timers: Rearrange timer.h & make legacy functions call non-legacy Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 25/31] aio / timers: Remove main_loop_timerlist Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 26/31] aio / timers: Convert rtc_clock to be a QEMUClockType Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 27/31] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API Alex Bligh
2013-08-15 20:34 ` Alex Bligh [this message]
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 29/31] aio / timers: Add scripts/switch-timer-api Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 30/31] aio / timers: Switch entire codebase to the new timer API Alex Bligh
2013-08-15 20:34 ` [Qemu-devel] [PATCHv11 31/31] aio / timers: Remove legacy interface Alex Bligh
2013-08-16 15:24 ` [Qemu-devel] [PATCHv11 00/31] aio / timers: Add AioContext timers and use ppoll Stefan Hajnoczi
2013-08-16 15:37 ` Alex Bligh
2013-08-19 12:40 ` Stefan Hajnoczi
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1376598879-18976-29-git-send-email-alex@alex.org.uk \
--to=alex@alex.org.uk \
--cc=aliguori@us.ibm.com \
--cc=jan.kiszka@siemens.com \
--cc=kwolf@redhat.com \
--cc=morita.kazutaka@lab.ntt.co.jp \
--cc=pbonzini@redhat.com \
--cc=qemu-devel@nongnu.org \
--cc=qemulist@gmail.com \
--cc=rth@twiddle.net \
--cc=stefanha@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).