From patchwork Fri Nov 29 16:45:34 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Wolf X-Patchwork-Id: 295457 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id D8B282C00E4 for ; Sat, 30 Nov 2013 03:54:18 +1100 (EST) Received: from localhost ([::1]:48334 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmRKa-0007no-9d for incoming@patchwork.ozlabs.org; Fri, 29 Nov 2013 11:54:16 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:53938) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmRDS-0004FH-1R for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:58 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VmRDN-0002uA-7P for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:53 -0500 Received: from mx1.redhat.com ([209.132.183.28]:23281) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VmRDM-0002u5-TY for qemu-devel@nongnu.org; Fri, 29 Nov 2013 11:46:49 -0500 Received: from int-mx11.intmail.prod.int.phx2.redhat.com (int-mx11.intmail.prod.int.phx2.redhat.com [10.5.11.24]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id rATGkl3h000874 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Fri, 29 Nov 2013 11:46:47 -0500 Received: from dhcp-200-207.str.redhat.com (ovpn-116-75.ams2.redhat.com [10.36.116.75]) by int-mx11.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id rATGkEqj019151; Fri, 29 Nov 2013 11:46:46 -0500 From: Kevin Wolf To: anthony@codemonkey.ws Date: Fri, 29 Nov 2013 17:45:34 +0100 Message-Id: <1385743555-27888-20-git-send-email-kwolf@redhat.com> In-Reply-To: <1385743555-27888-1-git-send-email-kwolf@redhat.com> References: <1385743555-27888-1-git-send-email-kwolf@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.24 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: kwolf@redhat.com, qemu-devel@nongnu.org Subject: [Qemu-devel] [PULL 19/41] Test coroutine execution order X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org From: Charlie Shepherd This patch adds a test for coroutine execution order in test-coroutine - this catches a bug in the CPC coroutine implementation. Signed-off-by: Charlie Shepherd Reviewed-by: Kevin Wolf Signed-off-by: Kevin Wolf --- tests/test-coroutine.c | 54 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 54 insertions(+) diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c index 15a885e..760636d 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 */ @@ -243,6 +296,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);