From: Kevin Wolf <kwolf@redhat.com>
To: anthony@codemonkey.ws
Cc: kwolf@redhat.com, qemu-devel@nongnu.org
Subject: [Qemu-devel] [PULL 19/41] Test coroutine execution order
Date: Fri, 29 Nov 2013 17:45:34 +0100 [thread overview]
Message-ID: <1385743555-27888-20-git-send-email-kwolf@redhat.com> (raw)
In-Reply-To: <1385743555-27888-1-git-send-email-kwolf@redhat.com>
From: Charlie Shepherd <charlie@ctshepherd.com>
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 <charlie@ctshepherd.com>
Reviewed-by: Kevin Wolf <kwolf@redhat.com>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
---
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);
--
1.8.1.4
next prev parent reply other threads:[~2013-11-29 16:46 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-11-29 16:45 [Qemu-devel] [PULL 00/41] Block patches for 2.0 (flushing block-next) Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 01/41] block: make BdrvRequestFlags public Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 02/41] block: add flags to bdrv_*_write_zeroes Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 03/41] block: introduce BDRV_REQ_MAY_UNMAP request flag Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 04/41] block: add logical block provisioning info to BlockDriverInfo Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 05/41] block: add wrappers for logical block provisioning information Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 06/41] block/iscsi: add .bdrv_get_info Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 07/41] block: add BlockLimits structure to BlockDriverState Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 08/41] block/raw: copy BlockLimits on raw_open Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 09/41] block: honour BlockLimits in bdrv_co_do_write_zeroes Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 10/41] block: honour BlockLimits in bdrv_co_discard Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 11/41] iscsi: set limits in BlockDriverState Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 12/41] iscsi: simplify iscsi_co_discard Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 13/41] iscsi: add bdrv_co_write_zeroes Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 14/41] block: introduce bdrv_make_zero Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 15/41] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 16/41] qemu-img: add support for fully allocated images Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 17/41] qemu-img: conditionally zero out target on convert Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 18/41] util/error: Save errno from clobbering Kevin Wolf
2013-11-29 16:45 ` Kevin Wolf [this message]
2013-11-29 16:45 ` [Qemu-devel] [PULL 20/41] sheepdog: implement .bdrv_get_allocated_file_size Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 21/41] block/stream: Don't stream unbacked devices Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 22/41] block: per caller dirty bitmap Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 23/41] qapi: Change BlockDirtyInfo to list Kevin Wolf
2013-11-30 20:38 ` Eric Blake
2013-12-02 10:29 ` Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 24/41] COW: Speed up writes Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 25/41] COW: Extend checking allocated bits to beyond one sector Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 26/41] MAINTAINERS: add sheepdog development mailing list Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 27/41] qdict: Fix memory leak in qdict_do_flatten() Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 28/41] qdict: Optimise qdict_do_flatten() Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 29/41] sheepdog: refactor do_sd_create() Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 30/41] sheepdog: support user-defined redundancy option Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 31/41] qemu-iotests: Drop local version of cancel_and_wait from 040 Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 32/41] blkdebug: add "remove_break" command Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 33/41] qemu-iotest: Add pause_drive and resume_drive methods Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 34/41] qemu-iotests: Make test case 030, 040 and 055 deterministic Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 35/41] block: Enable BDRV_O_SNAPSHOT with driver-specific options Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 36/41] qemu-iotests: Test snapshot mode Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 37/41] block: Use BDRV_O_NO_BACKING where appropriate Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 38/41] qemu-iotests: Filter qemu-io output in 025 Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 40/41] vmdk: Allow read only open of VMDK version 3 Kevin Wolf
2013-11-29 16:45 ` [Qemu-devel] [PULL 41/41] qemu-iotests: Add sample image and test for " Kevin Wolf
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=1385743555-27888-20-git-send-email-kwolf@redhat.com \
--to=kwolf@redhat.com \
--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).