[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PULL 4/5] aio-posix: Skip external nodes in aio_dispatch
From: |
Kevin Wolf |
Subject: |
[Qemu-block] [PULL 4/5] aio-posix: Skip external nodes in aio_dispatch |
Date: |
Fri, 22 Apr 2016 17:05:40 +0200 |
From: Fam Zheng <address@hidden>
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 <address@hidden>
Reviewed-by: Jeff Cody <address@hidden>
Signed-off-by: Kevin Wolf <address@hidden>
---
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;
--
1.8.3.1
- [Qemu-block] [PULL 0/5] Mirror block job fixes for 2.6.0-rc4, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 3/5] virtio: Mark host notifiers as external, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 2/5] event-notifier: Add "is_external" parameter, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 1/5] iohandler: Introduce iohandler_get_aio_context, Kevin Wolf, 2016/04/22
- [Qemu-block] [PULL 4/5] aio-posix: Skip external nodes in aio_dispatch,
Kevin Wolf <=
- [Qemu-block] [PULL 5/5] mirror: Workaround for unexpected iohandler events during completion, Kevin Wolf, 2016/04/22
- Re: [Qemu-block] [PULL 0/5] Mirror block job fixes for 2.6.0-rc4, Peter Maydell, 2016/04/22