[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH v7 20/25] tests: fixes aio-win32 about aio_remove_fd_handler, get
From: |
Yonggang Luo |
Subject: |
[PATCH v7 20/25] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c |
Date: |
Thu, 10 Sep 2020 18:37:20 +0800 |
This is a fixes for
(C:\work\xemu\qemu\build\tests\test-aio-multithread.exe:19100): GLib-CRITICAL
**: 23:03:24.965: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)'
failed
ERROR test-aio-multithread - Bail out! GLib-FATAL-CRITICAL:
g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)' failed
(C:\work\xemu\qemu\build\tests\test-bdrv-drain.exe:21036): GLib-CRITICAL **:
23:03:29.861: g_source_remove_poll: assertion '!SOURCE_DESTROYED (source)'
failed
ERROR test-bdrv-drain - Bail out! GLib-FATAL-CRITICAL: g_source_remove_poll:
assertion '!SOURCE_DESTROYED (source)' failed
And the idea comes from https://patchwork.kernel.org/patch/9975239/
Signed-off-by: Yonggang Luo <luoyonggang@gmail.com>
---
util/aio-win32.c | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)
diff --git a/util/aio-win32.c b/util/aio-win32.c
index 953c56ab48..9899546a8a 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -37,6 +37,15 @@ struct AioHandler {
static void aio_remove_fd_handler(AioContext *ctx, AioHandler *node)
{
+ /* If the GSource is in the process of being destroyed then
+ * g_source_remove_poll() causes an assertion failure. Skip
+ * removal in that case, because glib cleans up its state during
+ * destruction anyway.
+ */
+ if (!g_source_is_destroyed(&ctx->source)) {
+ g_source_remove_poll(&ctx->source, &node->pfd);
+ }
+
/* If aio_poll is in progress, just mark the node as deleted */
if (qemu_lockcnt_count(&ctx->list_lock)) {
node->deleted = 1;
@@ -139,8 +148,6 @@ void aio_set_event_notifier(AioContext *ctx,
/* Are we deleting the fd handler? */
if (!io_notify) {
if (node) {
- g_source_remove_poll(&ctx->source, &node->pfd);
-
aio_remove_fd_handler(ctx, node);
}
} else {
--
2.28.0.windows.1
- [PATCH v7 17/25] cirrus: Building freebsd in a single short, Yonggang Luo, 2020/09/10
- [PATCH v7 18/25] tests: Convert g_free to g_autofree macro in test-logging.c, Yonggang Luo, 2020/09/10
- [PATCH v7 19/25] tests: Fixes test-io-channel-socket.c tests under msys2/mingw, Yonggang Luo, 2020/09/10
- [PATCH v7 20/25] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c,
Yonggang Luo <=
- [PATCH v7 21/25] tests: Fixes test-io-channel-file by mask only owner file state mask bits, Yonggang Luo, 2020/09/10
- [PATCH v7 22/25] tests: fix test-util-sockets.c, Yonggang Luo, 2020/09/10
- [PATCH v7 23/25] tests: Fixes test-qdev-global-props.c, Yonggang Luo, 2020/09/10
- [PATCH v7 24/25] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full, Yonggang Luo, 2020/09/10
- [PATCH v7 25/25] ci: Enable msys2 ci in cirrus, Yonggang Luo, 2020/09/10
- Re: [PATCH v7 17/25] cirrus: Building freebsd in a single short, Thomas Huth, 2020/09/10