From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:56881) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6QCo-0003Tm-5L for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:12:41 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1V6QCg-0001Wv-QY for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:12:34 -0400 Received: from mail6.webfaction.com ([74.55.86.74]:51563 helo=smtp.webfaction.com) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1V6QCg-0001Wd-JC for qemu-devel@nongnu.org; Mon, 05 Aug 2013 15:12:26 -0400 From: Charlie Shepherd Date: Mon, 5 Aug 2013 21:11:09 +0200 Message-Id: <1375729869-10902-1-git-send-email-charlie@ctshepherd.com> Subject: [Qemu-devel] [PATCH] Test coroutine execution order List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, pbonzini@redhat.com, gabriel@kerneis.info, Charlie Shepherd , stefanha@gmail.com This patch adds a test for coroutine execution order in test-coroutine - this catches a bug in the CPC coroutine implementation. --- tests/test-coroutine.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c index 39be046..3b763c2 100644 --- a/tests/test-coroutine.c +++ b/tests/test-coroutine.c @@ -150,6 +150,59 @@ static void test_lifecycle(void) g_assert(done); /* expect done to be true (second time) */ } + +#define RECORD_SIZE 10 /* Leave some room for expansion */ +struct coroutine_position { + int func; + int state; +}; +static struct coroutine_position records[RECORD_SIZE]; +static unsigned record_pos; + +static void record_push(int func, int state) +{ + struct coroutine_position *cp = &records[record_pos++]; + g_assert_cmpint(record_pos, <, RECORD_SIZE); + cp->func = func; + cp->state = state; +} + +static void coroutine_fn co_order_test(void *opaque) +{ + record_push(2, 1); + g_assert(qemu_in_coroutine()); + qemu_coroutine_yield(); + record_push(2, 2); + g_assert(qemu_in_coroutine()); +} + +static void do_order_test(void) +{ + Coroutine *co; + + co = qemu_coroutine_create(co_order_test); + record_push(1, 1); + qemu_coroutine_enter(co, NULL); + record_push(1, 2); + g_assert(!qemu_in_coroutine()); + qemu_coroutine_enter(co, NULL); + record_push(1, 3); + g_assert(!qemu_in_coroutine()); +} + +static void test_order(void) +{ + int i; + const struct coroutine_position expected_pos[] = { + {1, 1,}, {2, 1}, {1, 2}, {2, 2}, {1, 3} + }; + do_order_test(); + g_assert_cmpint(record_pos, ==, 5); + for (i = 0; i < record_pos; i++) { + g_assert_cmpint(records[i].func , ==, expected_pos[i].func ); + g_assert_cmpint(records[i].state, ==, expected_pos[i].state); + } +} /* * Lifecycle benchmark */ @@ -211,6 +264,7 @@ int main(int argc, char **argv) g_test_add_func("/basic/nesting", test_nesting); g_test_add_func("/basic/self", test_self); g_test_add_func("/basic/in_coroutine", test_in_coroutine); + g_test_add_func("/basic/order", test_order); if (g_test_perf()) { g_test_add_func("/perf/lifecycle", perf_lifecycle); g_test_add_func("/perf/nesting", perf_nesting); -- 1.8.3.2