From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:41018) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZNLo4-0005QD-5L for qemu-devel@nongnu.org; Thu, 06 Aug 2015 10:06:09 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZNLnz-0000bY-ET for qemu-devel@nongnu.org; Thu, 06 Aug 2015 10:06:04 -0400 From: Paolo Bonzini Date: Thu, 6 Aug 2015 15:36:03 +0200 Message-Id: <1438868176-20364-6-git-send-email-pbonzini@redhat.com> In-Reply-To: <1438868176-20364-1-git-send-email-pbonzini@redhat.com> References: <1438868176-20364-1-git-send-email-pbonzini@redhat.com> Subject: [Qemu-devel] [PATCH 05/18] aio: tweak walking in dispatch phase List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: kwolf@redhat.com, famz@redhat.com, stefanha@redhat.com, qemu-block@nongnu.org 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 d477033..b8aaa92 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -124,7 +124,7 @@ bool aio_pending(AioContext *ctx) bool aio_dispatch(AioContext *ctx) { - AioHandler *node; + AioHandler *node, *tmp; bool progress = false; /* @@ -140,12 +140,10 @@ bool aio_dispatch(AioContext *ctx) * 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; @@ -167,17 +165,17 @@ bool aio_dispatch(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) { + g_free(node); + } + ctx->walking_handlers++; } } + ctx->walking_handlers--; + /* Run our timers */ progress |= timerlistgroup_run_timers(&ctx->tlg); diff --git a/aio-win32.c b/aio-win32.c index 50a6867..2b4b156 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -203,20 +203,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) { @@ -251,17 +249,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(tmp, node); + g_free(tmp); + } + ctx->walking_handlers++; } } + ctx->walking_handlers--; return progress; } -- 2.4.3