[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 02/16] test-coroutine: add simple CoMutex test
From: |
Fam Zheng |
Subject: |
[Qemu-devel] [PULL 02/16] test-coroutine: add simple CoMutex test |
Date: |
Thu, 8 Feb 2018 10:19:39 +0800 |
From: Paolo Bonzini <address@hidden>
In preparation for adding a similar test using QemuLockable, add a very
simple testcase that has two interleaved calls to lock and unlock.
Reviewed-by: Stefan Hajnoczi <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
Message-Id: <address@hidden>
Reviewed-by: Richard Henderson <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Signed-off-by: Fam Zheng <address@hidden>
---
tests/test-coroutine.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++++--
1 file changed, 48 insertions(+), 2 deletions(-)
diff --git a/tests/test-coroutine.c b/tests/test-coroutine.c
index 76c646107e..ab8fdf701e 100644
--- a/tests/test-coroutine.c
+++ b/tests/test-coroutine.c
@@ -175,7 +175,7 @@ static void coroutine_fn c1_fn(void *opaque)
qemu_coroutine_enter(c2);
}
-static void test_co_queue(void)
+static void test_no_dangling_access(void)
{
Coroutine *c1;
Coroutine *c2;
@@ -195,6 +195,51 @@ static void test_co_queue(void)
*c1 = tmp;
}
+static bool locked;
+static int done;
+
+static void coroutine_fn mutex_fn(void *opaque)
+{
+ CoMutex *m = opaque;
+ qemu_co_mutex_lock(m);
+ assert(!locked);
+ locked = true;
+ qemu_coroutine_yield();
+ locked = false;
+ qemu_co_mutex_unlock(m);
+ done++;
+}
+
+static void do_test_co_mutex(CoroutineEntry *entry, void *opaque)
+{
+ Coroutine *c1 = qemu_coroutine_create(entry, opaque);
+ Coroutine *c2 = qemu_coroutine_create(entry, opaque);
+
+ done = 0;
+ qemu_coroutine_enter(c1);
+ g_assert(locked);
+ qemu_coroutine_enter(c2);
+
+ /* Unlock queues c2. It is then started automatically when c1 yields or
+ * terminates.
+ */
+ qemu_coroutine_enter(c1);
+ g_assert_cmpint(done, ==, 1);
+ g_assert(locked);
+
+ qemu_coroutine_enter(c2);
+ g_assert_cmpint(done, ==, 2);
+ g_assert(!locked);
+}
+
+static void test_co_mutex(void)
+{
+ CoMutex m;
+
+ qemu_co_mutex_init(&m);
+ do_test_co_mutex(mutex_fn, &m);
+}
+
/*
* Check that creation, enter, and return work
*/
@@ -422,7 +467,7 @@ int main(int argc, char **argv)
* crash, so skip it.
*/
if (CONFIG_COROUTINE_POOL) {
- g_test_add_func("/basic/co_queue", test_co_queue);
+ g_test_add_func("/basic/no-dangling-access", test_no_dangling_access);
}
g_test_add_func("/basic/lifecycle", test_lifecycle);
@@ -432,6 +477,7 @@ int main(int argc, char **argv)
g_test_add_func("/basic/entered", test_entered);
g_test_add_func("/basic/in_coroutine", test_in_coroutine);
g_test_add_func("/basic/order", test_order);
+ g_test_add_func("/locking/co-mutex", test_co_mutex);
if (g_test_perf()) {
g_test_add_func("/perf/lifecycle", perf_lifecycle);
g_test_add_func("/perf/nesting", perf_nesting);
--
2.14.3
- [Qemu-devel] [PULL 00/16] Docker and block patches, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 01/16] docker: change Fedora base image to fedora:27, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 02/16] test-coroutine: add simple CoMutex test,
Fam Zheng <=
- [Qemu-devel] [PULL 04/16] coroutine-lock: convert CoQueue to use QemuLockable, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 03/16] lockable: add QemuLockable, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 05/16] coroutine-lock: make qemu_co_enter_next thread-safe, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 06/16] curl: convert to CoQueue, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 07/16] stubs: Add stubs for ram block API, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 08/16] util: Introduce vfio helpers, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 10/16] block: Introduce buf register API, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 12/16] qemu-img: Map bench buffer, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 11/16] block/nvme: Implement .bdrv_(un)register_buf, Fam Zheng, 2018/02/07
- [Qemu-devel] [PULL 09/16] block: Add VFIO based NVMe driver, Fam Zheng, 2018/02/07