qemu-devel.nongnu.org archive mirror
 help / color / mirror / Atom feed
From: Yonggang Luo <luoyonggang@gmail.com>
To: qemu-devel@nongnu.org
Cc: Kevin Wolf <kwolf@redhat.com>, Ed Maste <emaste@freebsd.org>,
	Michael Roth <mdroth@linux.vnet.ibm.com>,
	qemu-block@nongnu.org, Stefan Weil <sw@weilnetz.de>,
	Xie Changlong <xiechanglong.d@gmail.com>,
	Richard Henderson <richard.henderson@linaro.org>,
	Markus Armbruster <armbru@redhat.com>,
	Max Reitz <mreitz@redhat.com>,
	Yonggang Luo <luoyonggang@gmail.com>,
	Gerd Hoffmann <kraxel@redhat.com>,
	Wen Congyang <wencongyang2@huawei.com>,
	Paolo Bonzini <pbonzini@redhat.com>,
	Li-Wen Hsu <lwhsu@freebsd.org>, Peter Lieven <pl@kamp.de>
Subject: [PATCH v10 18/26] tests: fixes aio-win32 about aio_remove_fd_handler, get it consistence with aio-posix.c
Date: Wed, 16 Sep 2020 01:12:26 +0800	[thread overview]
Message-ID: <20200915171234.236-19-luoyonggang@gmail.com> (raw)
In-Reply-To: <20200915171234.236-1-luoyonggang@gmail.com>

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 | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/util/aio-win32.c b/util/aio-win32.c
index 953c56ab48..49bd90e62e 100644
--- a/util/aio-win32.c
+++ b/util/aio-win32.c
@@ -37,6 +37,16 @@ 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 +149,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



  parent reply	other threads:[~2020-09-15 17:29 UTC|newest]

Thread overview: 33+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-09-15 17:12 [PATCH v10 00/26] W32, W64 msys2/mingw patches Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 01/26] rcu: Implement drain_call_rcu Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 02/26] ci: fixes msys2 build by upgrading capstone to 4.0.2 Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 03/26] configure: Fixes ncursesw detection under msys2/mingw and enable curses Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 04/26] win32: Simplify gmtime_r detection direct base on _POSIX_THREAD_SAFE_FUNCTIONS Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 05/26] curses: Fixes curses compiling errors Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 06/26] tests: disable /char/stdio/* tests in test-char.c on win32 Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 07/26] tests: Fixes test-replication.c on msys2/mingw Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 08/26] tests: test-replication disable /replication/secondary/* " Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 09/26] osdep: file locking functions are not available on Win32 Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 10/26] meson: Use -b to ignore CR vs. CR-LF issues on Windows Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 11/26] gcrypt: test_tls_psk_init should write binary file instead text file Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 12/26] tests: Enable crypto tests under msys2/mingw Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 13/26] meson: remove empty else and duplicated gio deps Yonggang Luo
2020-09-16  9:10   ` Laurent Vivier
2020-09-15 17:12 ` [PATCH v10 14/26] vmstate: Fixes test-vmstate.c on msys2/mingw Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 15/26] cirrus: Building freebsd in a single short Yonggang Luo
2020-09-15 17:48   ` Philippe Mathieu-Daudé
2020-09-15 17:49     ` 罗勇刚(Yonggang Luo)
2020-09-15 17:12 ` [PATCH v10 16/26] tests: Convert g_free to g_autofree macro in test-logging.c Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 17/26] tests: Fixes test-io-channel-socket.c tests under msys2/mingw Yonggang Luo
2020-09-15 17:12 ` Yonggang Luo [this message]
2020-09-15 17:12 ` [PATCH v10 19/26] tests: Fixes test-io-channel-file by mask only owner file state mask bits Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 20/26] tests: fix test-util-sockets.c Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 21/26] tests: Fixes test-qdev-global-props.c Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 22/26] rcu: fixes test-logging.c by call drain_call_rcu before rmdir_full Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 23/26] meson: upgrade meson for execute custom ninjatool under msys2 properly Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 24/26] ci: Enable msys2 ci in cirrus Yonggang Luo
2020-09-15 17:12 ` [PATCH v10 25/26] block: Fixes nfs compiling error on msys2/mingw Yonggang Luo
2020-09-20 19:03   ` Peter Lieven
2020-09-15 17:12 ` [PATCH v10 26/26] block: enable libnfs on msys2/mingw in cirrus.yml Yonggang Luo
2020-09-16 11:52 ` [PATCH v10 00/26] W32, W64 msys2/mingw patches Thomas Huth
2020-09-16 12:04   ` 罗勇刚(Yonggang Luo)

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=20200915171234.236-19-luoyonggang@gmail.com \
    --to=luoyonggang@gmail.com \
    --cc=armbru@redhat.com \
    --cc=emaste@freebsd.org \
    --cc=kraxel@redhat.com \
    --cc=kwolf@redhat.com \
    --cc=lwhsu@freebsd.org \
    --cc=mdroth@linux.vnet.ibm.com \
    --cc=mreitz@redhat.com \
    --cc=pbonzini@redhat.com \
    --cc=pl@kamp.de \
    --cc=qemu-block@nongnu.org \
    --cc=qemu-devel@nongnu.org \
    --cc=richard.henderson@linaro.org \
    --cc=sw@weilnetz.de \
    --cc=wencongyang2@huawei.com \
    --cc=xiechanglong.d@gmail.com \
    /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).