[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 06/11] aio-posix: split aio_dispatch_handlers out of
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 06/11] aio-posix: split aio_dispatch_handlers out of aio_dispatch |
Date: |
Mon, 16 Jan 2017 13:39:06 +0000 |
From: Paolo Bonzini <address@hidden>
This simplifies the handling of dispatch_fds.
Signed-off-by: Paolo Bonzini <address@hidden>
Reviewed-by: Fam Zheng <address@hidden>
Reviewed-by: Stefan Hajnoczi <address@hidden>
Message-id: address@hidden
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
aio-posix.c | 43 +++++++++++++++++++++++++------------------
1 file changed, 25 insertions(+), 18 deletions(-)
diff --git a/aio-posix.c b/aio-posix.c
index 1585571..25198d9 100644
--- a/aio-posix.c
+++ b/aio-posix.c
@@ -367,31 +367,16 @@ bool aio_pending(AioContext *ctx)
return false;
}
-/*
- * Note that dispatch_fds == false has the side-effect of post-poning the
- * freeing of deleted handlers.
- */
-bool aio_dispatch(AioContext *ctx, bool dispatch_fds)
+static bool aio_dispatch_handlers(AioContext *ctx)
{
- AioHandler *node = NULL;
+ AioHandler *node;
bool progress = false;
/*
- * If there are callbacks left that have been queued, we need to call them.
- * Do not call select in this case, because it is possible that the caller
- * does not need a complete flush (as is the case for aio_poll loops).
- */
- if (aio_bh_poll(ctx)) {
- progress = true;
- }
-
- /*
* We have to walk very carefully in case aio_set_fd_handler is
* called while we're walking.
*/
- if (dispatch_fds) {
- node = QLIST_FIRST(&ctx->aio_handlers);
- }
+ node = QLIST_FIRST(&ctx->aio_handlers);
while (node) {
AioHandler *tmp;
int revents;
@@ -431,6 +416,28 @@ bool aio_dispatch(AioContext *ctx, bool dispatch_fds)
}
}
+ return progress;
+}
+
+/*
+ * Note that dispatch_fds == false has the side-effect of post-poning the
+ * freeing of deleted handlers.
+ */
+bool aio_dispatch(AioContext *ctx, bool dispatch_fds)
+{
+ bool progress;
+
+ /*
+ * If there are callbacks left that have been queued, we need to call them.
+ * Do not call select in this case, because it is possible that the caller
+ * does not need a complete flush (as is the case for aio_poll loops).
+ */
+ progress = aio_bh_poll(ctx);
+
+ if (dispatch_fds) {
+ progress |= aio_dispatch_handlers(ctx);
+ }
+
/* Run our timers */
progress |= timerlistgroup_run_timers(&ctx->tlg);
--
2.9.3
- [Qemu-devel] [PULL 00/11] Block patches, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 01/11] block: get rid of bdrv_io_unplugged_begin/end, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 02/11] aio: rename bh_lock to list_lock, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 03/11] qemu-thread: introduce QemuLockCnt, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 04/11] aio: make ctx->list_lock a QemuLockCnt, subsuming ctx->walking_bh, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 06/11] aio-posix: split aio_dispatch_handlers out of aio_dispatch,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 05/11] qemu-thread: optimize QemuLockCnt with futexes on Linux, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 07/11] aio: tweak walking in dispatch phase, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 08/11] aio-posix: remove walking_handlers, protecting AioHandler list with list_lock, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 09/11] aio-win32: remove walking_handlers, protecting AioHandler list with list_lock, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 11/11] async: optimize aio_bh_poll, Stefan Hajnoczi, 2017/01/16
- [Qemu-devel] [PULL 10/11] aio: document locking, Stefan Hajnoczi, 2017/01/16
- Re: [Qemu-devel] [PULL 00/11] Block patches, Peter Maydell, 2017/01/17