From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54521) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1azitA-0006nj-I8 for qemu-devel@nongnu.org; Mon, 09 May 2016 06:58:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1azit6-0007gd-9J for qemu-devel@nongnu.org; Mon, 09 May 2016 06:58:11 -0400 Sender: Paolo Bonzini References: <1461337541-4844-1-git-send-email-kwolf@redhat.com> <1461337541-4844-5-git-send-email-kwolf@redhat.com> From: Paolo Bonzini Message-ID: <57306D3D.3070401@redhat.com> Date: Mon, 9 May 2016 12:58:05 +0200 MIME-Version: 1.0 In-Reply-To: <1461337541-4844-5-git-send-email-kwolf@redhat.com> Content-Type: text/plain; charset=windows-1252 Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PULL 4/5] aio-posix: Skip external nodes in aio_dispatch List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Kevin Wolf , qemu-block@nongnu.org Cc: peter.maydell@linaro.org, qemu-devel@nongnu.org On 22/04/2016 17:05, Kevin Wolf wrote: > From: Fam Zheng > > aio_poll doesn't poll the external nodes so this should never be true, > but aio_ctx_dispatch may get notified by the events from GSource. To > make bdrv_drained_begin effective in main loop, we should check the > is_external flag here too. > > Also do the check in aio_pending so aio_dispatch is not called > superfluously, when there is no events other than external ones. > > Signed-off-by: Fam Zheng > Reviewed-by: Jeff Cody > Signed-off-by: Kevin Wolf Are you going to do the aio-win32 version? I'm not sure what's the state of ioeventfd emulation. Paolo > --- > aio-posix.c | 8 ++++++-- > 1 file changed, 6 insertions(+), 2 deletions(-) > > diff --git a/aio-posix.c b/aio-posix.c > index 7fd565f..6006122 100644 > --- a/aio-posix.c > +++ b/aio-posix.c > @@ -282,10 +282,12 @@ bool aio_pending(AioContext *ctx) > int revents; > > revents = node->pfd.revents & node->pfd.events; > - if (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR) && node->io_read) { > + if (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR) && node->io_read && > + aio_node_check(ctx, node->is_external)) { > return true; > } > - if (revents & (G_IO_OUT | G_IO_ERR) && node->io_write) { > + if (revents & (G_IO_OUT | G_IO_ERR) && node->io_write && > + aio_node_check(ctx, node->is_external)) { > return true; > } > } > @@ -323,6 +325,7 @@ bool aio_dispatch(AioContext *ctx) > > if (!node->deleted && > (revents & (G_IO_IN | G_IO_HUP | G_IO_ERR)) && > + aio_node_check(ctx, node->is_external) && > node->io_read) { > node->io_read(node->opaque); > > @@ -333,6 +336,7 @@ bool aio_dispatch(AioContext *ctx) > } > if (!node->deleted && > (revents & (G_IO_OUT | G_IO_ERR)) && > + aio_node_check(ctx, node->is_external) && > node->io_write) { > node->io_write(node->opaque); > progress = true; >