From patchwork Fri Jan 15 15:12:15 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Bonzini X-Patchwork-Id: 8042641 Return-Path: X-Original-To: patchwork-qemu-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 0353F9F716 for ; Fri, 15 Jan 2016 15:21:23 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 5FF5F203F4 for ; Fri, 15 Jan 2016 15:21:22 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 9F41A203B4 for ; Fri, 15 Jan 2016 15:21:21 +0000 (UTC) Received: from localhost ([::1]:47552 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK6Bl-0004Ai-1F for patchwork-qemu-devel@patchwork.kernel.org; Fri, 15 Jan 2016 10:21:21 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46292) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK63O-0005eM-L2 for qemu-devel@nongnu.org; Fri, 15 Jan 2016 10:12:43 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1aK63N-0006Gj-JK for qemu-devel@nongnu.org; Fri, 15 Jan 2016 10:12:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:50058) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1aK63N-0006Gc-Ca for qemu-devel@nongnu.org; Fri, 15 Jan 2016 10:12:41 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id 1E0BF383AC7 for ; Fri, 15 Jan 2016 15:12:41 +0000 (UTC) Received: from donizetti.redhat.com (ovpn-112-70.ams2.redhat.com [10.36.112.70]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id u0FFCJ4k003942; Fri, 15 Jan 2016 10:12:39 -0500 From: Paolo Bonzini To: qemu-devel@nongnu.org Date: Fri, 15 Jan 2016 16:12:15 +0100 Message-Id: <1452870739-28484-13-git-send-email-pbonzini@redhat.com> In-Reply-To: <1452870739-28484-1-git-send-email-pbonzini@redhat.com> References: <1452870739-28484-1-git-send-email-pbonzini@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.22 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: stefanha@redhat.com Subject: [Qemu-devel] [PATCH 12/16] aio: tweak walking in dispatch phase X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Preparing for the following patch, use QLIST_FOREACH_SAFE and modify the placement of walking_handlers increment/decrement. Signed-off-by: Paolo Bonzini --- aio-posix.c | 27 +++++++++++++-------------- aio-win32.c | 26 ++++++++++++-------------- 2 files changed, 25 insertions(+), 28 deletions(-) diff --git a/aio-posix.c b/aio-posix.c index 980bd41..1aa72d4 100644 --- a/aio-posix.c +++ b/aio-posix.c @@ -294,7 +294,7 @@ bool aio_pending(AioContext *ctx) bool aio_dispatch(AioContext *ctx) { - AioHandler *node; + AioHandler *node, *tmp; bool progress = false; /* @@ -310,12 +310,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; @@ -337,17 +335,18 @@ 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) { + QLIST_REMOVE(node, node); + 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 6622cbf..61e4610 100644 --- a/aio-win32.c +++ b/aio-win32.c @@ -208,20 +208,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) { @@ -256,17 +254,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; }