From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:44295) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cRjnM-0000CE-1L for qemu-devel@nongnu.org; Thu, 12 Jan 2017 13:08:21 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cRjnI-0005FO-Bh for qemu-devel@nongnu.org; Thu, 12 Jan 2017 13:08:15 -0500 Received: from mail-wm0-x242.google.com ([2a00:1450:400c:c09::242]:36789) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1cRjnI-0005FB-5m for qemu-devel@nongnu.org; Thu, 12 Jan 2017 13:08:12 -0500 Received: by mail-wm0-x242.google.com with SMTP id r126so5475310wmr.3 for ; Thu, 12 Jan 2017 10:08:12 -0800 (PST) Sender: Paolo Bonzini From: Paolo Bonzini Date: Thu, 12 Jan 2017 19:07:56 +0100 Message-Id: <20170112180800.21085-7-pbonzini@redhat.com> In-Reply-To: <20170112180800.21085-1-pbonzini@redhat.com> References: <20170112180800.21085-1-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 06/10] aio: tweak walking in dispatch phase List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: famz@redhat.com, stefanha@redhat.com Preparing for the following patch, use QLIST_FOREACH_SAFE and modify the placement of walking_handlers increment/decrement. Reviewed-by: Stefan Hajnoczi Signed-off-by: Paolo Bonzini --- aio-posix.c | 26 ++++++++++++-------------- aio-win32.c | 26 ++++++++++++-------------- 2 files changed, 24 insertions(+), 28 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 25198d9..f83b7af 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -369,19 +369,17 @@ bool aio_pending(AioContext *ctx) static bool aio_dispatch_handlers(AioContext *ctx) { - AioHandler *node; + AioHandler *node, *tmp; bool progress = false; /* * We have to walk very carefully in case aio_set_fd_handler is * called while we're walking. */ - node = QLIST_FIRST(&ctx->aio_handlers); - while (node) { - AioHandler *tmp; - int revents; + ctx->walking_handlers++; - ctx->walking_handlers++; + QLIST_FOREACH_SAFE(node, &ctx->aio_handlers, node, tmp) { + int revents; revents = node->pfd.revents & node->pfd.events; node->pfd.revents = 0; @@ -405,17 +403,17 @@ static bool aio_dispatch_handlers(AioContext *ctx) progress = true; } - tmp = node; - node = QLIST_NEXT(node, node); - - ctx->walking_handlers--; - - if (!ctx->walking_handlers && tmp->deleted) { - QLIST_REMOVE(tmp, node); - g_free(tmp); + if (node->deleted) { + ctx->walking_handlers--; + if (!ctx->walking_handlers) { + QLIST_REMOVE(node, node); + g_free(node); + } + ctx->walking_handlers++; } } + ctx->walking_handlers--; return progress; } diff --git a/aio-win32.c b/aio-win32.c index d19dc42..1ad459d 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -227,20 +227,18 @@ bool aio_pending(AioContext *ctx) static bool aio_dispatch_handlers(AioContext *ctx, HANDLE event) { - AioHandler *node; + AioHandler *node, *tmp; bool progress = false; + ctx->walking_handlers++; + /* * We have to walk very carefully in case aio_set_fd_handler is * called while we're walking. */ - node = QLIST_FIRST(&ctx->aio_handlers); - while (node) { - AioHandler *tmp; + QLIST_FOREACH_SAFE(node, &ctx->aio_handlers, node, tmp) { int revents = node->pfd.revents; - ctx->walking_handlers++; - if (!node->deleted && (revents || event_notifier_get_handle(node->e) == event) && node->io_notify) { @@ -275,17 +273,17 @@ static bool aio_dispatch_handlers(AioContext *ctx, HANDLE event) } } - tmp = node; - node = QLIST_NEXT(node, node); - - ctx->walking_handlers--; - - if (!ctx->walking_handlers && tmp->deleted) { - QLIST_REMOVE(tmp, node); - g_free(tmp); + if (node->deleted) { + ctx->walking_handlers--; + if (!ctx->walking_handlers) { + QLIST_REMOVE(node, node); + g_free(node); + } + ctx->walking_handlers++; } } + ctx->walking_handlers--; return progress; } -- 2.9.3