[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 19/41] Test coroutine execution order
From: |
Kevin Wolf |
Subject: |
[Qemu-devel] [PULL 19/41] Test coroutine execution order |
Date: |
Fri, 29 Nov 2013 17:45:34 +0100 |
From: Charlie Shepherd <address@hidden>
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 <address@hidden>
Reviewed-by: Kevin Wolf <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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
- [Qemu-devel] [PULL 09/41] block: honour BlockLimits in bdrv_co_do_write_zeroes, (continued)
- [Qemu-devel] [PULL 09/41] block: honour BlockLimits in bdrv_co_do_write_zeroes, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 10/41] block: honour BlockLimits in bdrv_co_discard, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 11/41] iscsi: set limits in BlockDriverState, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 12/41] iscsi: simplify iscsi_co_discard, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 13/41] iscsi: add bdrv_co_write_zeroes, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 14/41] block: introduce bdrv_make_zero, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 15/41] block/get_block_status: fix BDRV_BLOCK_ZERO for unallocated blocks, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 16/41] qemu-img: add support for fully allocated images, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 17/41] qemu-img: conditionally zero out target on convert, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 18/41] util/error: Save errno from clobbering, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 19/41] Test coroutine execution order,
Kevin Wolf <=
- [Qemu-devel] [PULL 20/41] sheepdog: implement .bdrv_get_allocated_file_size, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 21/41] block/stream: Don't stream unbacked devices, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 22/41] block: per caller dirty bitmap, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 24/41] COW: Speed up writes, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 25/41] COW: Extend checking allocated bits to beyond one sector, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 26/41] MAINTAINERS: add sheepdog development mailing list, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 23/41] qapi: Change BlockDirtyInfo to list, Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 27/41] qdict: Fix memory leak in qdict_do_flatten(), Kevin Wolf, 2013/11/29
- [Qemu-devel] [PULL 28/41] qdict: Optimise qdict_do_flatten(), Kevin Wolf, 2013/11/29