qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Stefan Hajnoczi <stefanha@redhat.com>
To: qemu-devel@nongnu.org
Cc: Stefan Hajnoczi <stefanha@redhat.com>,
	Alex Bligh <alex@alex.org.uk>,
	Anthony Liguori <anthony@codemonkey.ws>
Subject: [Qemu-devel] [PULL 36/42] aio / timers: Add test harness for AioContext timers
Date: Thu, 22 Aug 2013 22:11:32 +0200	[thread overview]
Message-ID: <1377202298-22896-37-git-send-email-stefanha@redhat.com> (raw)
In-Reply-To: <1377202298-22896-1-git-send-email-stefanha@redhat.com>

From: Alex Bligh <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>
Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
---
 tests/test-aio.c | 134 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)

diff --git a/tests/test-aio.c b/tests/test-aio.c
index e1f394b..3ad2294 100644
--- a/tests/test-aio.c
+++ b/tests/test-aio.c
@@ -47,6 +47,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;
@@ -55,6 +64,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;
@@ -343,6 +370,64 @@ 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);
+    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);
+    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:
@@ -625,6 +710,53 @@ 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);
+    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);
+    close(pipefd[0]);
+    close(pipefd[1]);
+
+    timer_del(&data.timer);
+}
+
+
 /* End of tests.  */
 
 int main(int argc, char **argv)
@@ -653,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);
@@ -667,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.8.3.1

  parent reply	other threads:[~2013-08-22 20:13 UTC|newest]

Thread overview: 43+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-08-22 20:10 [Qemu-devel] [PULL 00/42] Block patches Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 01/42] qcow2: Change default for new images to compat=1.1 Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 02/42] block: Introduce bs->zero_beyond_eof Stefan Hajnoczi
2013-08-22 20:10 ` [Qemu-devel] [PULL 03/42] block: Produce zeros when protocols reading beyond end of file Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 04/42] block: better error message for read only format name Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 05/42] vmdk: Move l1_size check into vmdk_add_extent() Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 06/42] vmdk: fix L1 and L2 table size in vmdk3 open Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 07/42] vmdk: support vmfsSparse files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 08/42] vmdk: support vmfs files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 09/42] aio / timers: Rename qemu_timer_* functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 10/42] aio / timers: Rename qemu_new_clock and expose clock types Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 11/42] aio / timers: add qemu-timer.c utility functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 12/42] aio / timers: Consistent treatment of disabled clocks for deadlines Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 13/42] aio / timers: add ppoll support with qemu_poll_ns Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 14/42] aio / timers: Add prctl(PR_SET_TIMERSLACK, 1, ...) to reduce timer slack Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 15/42] aio / timers: Make qemu_run_timers and qemu_run_all_timers return progress Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 16/42] aio / timers: Split QEMUClock into QEMUClock and QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 17/42] aio / timers: Untangle include files Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 18/42] aio / timers: Add QEMUTimerListGroup and helper functions Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 19/42] aio / timers: Add QEMUTimerListGroup to AioContext Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 20/42] aio / timers: Add a notify callback to QEMUTimerList Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 21/42] aio / timers: aio_ctx_prepare sets timeout from AioContext timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 22/42] aio / timers: Add aio_timer_init & aio_timer_new wrappers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 23/42] aio / timers: Convert aio_poll to use AioContext timers' deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 24/42] aio / timers: Convert mainloop to use timeout Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 25/42] aio / timers: On timer modification, qemu_notify or aio_notify Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 26/42] aio / timers: Introduce new API timer_new and friends Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 27/42] aio / timers: Use all timerlists in icount warp calculations Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 28/42] aio / timers: Add documentation and new format calls Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 29/42] aio / timers: Remove alarm timers Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 30/42] aio / timers: Remove legacy qemu_clock_deadline & qemu_timerlist_deadline Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 31/42] aio / timers: Add qemu_clock_get_ms and qemu_clock_get_ms Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 32/42] aio / timers: Rearrange timer.h & make legacy functions call non-legacy Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 33/42] aio / timers: Remove main_loop_timerlist Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 34/42] aio / timers: Convert rtc_clock to be a QEMUClockType Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 35/42] aio / timers: convert block_job_sleep_ns and co_sleep_ns to new API Stefan Hajnoczi
2013-08-22 20:11 ` Stefan Hajnoczi [this message]
2013-08-22 20:11 ` [Qemu-devel] [PULL 37/42] aio / timers: Add scripts/switch-timer-api Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 38/42] aio / timers: Switch entire codebase to the new timer API Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 39/42] aio / timers: Remove legacy interface Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 40/42] aio / timers: remove dummy_io_handler_flush from tests/test-aio.c Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 41/42] aio-win32: replace incorrect AioHandler->opaque usage with ->e Stefan Hajnoczi
2013-08-22 20:11 ` [Qemu-devel] [PULL 42/42] win32-aio: drop win32_aio_flush_cb() 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=1377202298-22896-37-git-send-email-stefanha@redhat.com \
    --to=stefanha@redhat.com \
    --cc=alex@alex.org.uk \
    --cc=anthony@codemonkey.ws \
    --cc=qemu-devel@nongnu.org \
    /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).