[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 21/39] aio: add non-blocking variant of aio_wait
From: |
Paolo Bonzini |
Subject: |
[Qemu-devel] [PATCH v2 21/39] aio: add non-blocking variant of aio_wait |
Date: |
Wed, 31 Oct 2012 16:30:38 +0100 |
This will be used when polling the GSource attached to an AioContext.
Reviewed-by: Anthony Liguori <address@hidden>
Signed-off-by: Paolo Bonzini <address@hidden>
---
aio.c | 20 +++++++++++++++-----
async.c | 2 +-
main-loop.c | 2 +-
qemu-aio.h | 21 +++++++++++++++------
4 file modificati, 32 inserzioni(+), 13 rimozioni(-)
diff --git a/aio.c b/aio.c
index 734d2cf..1d5e0c6 100644
--- a/aio.c
+++ b/aio.c
@@ -93,13 +93,16 @@ void aio_set_event_notifier(AioContext *ctx,
(AioFlushHandler *)io_flush, notifier);
}
-bool aio_wait(AioContext *ctx)
+bool aio_poll(AioContext *ctx, bool blocking)
{
+ static struct timeval tv0;
AioHandler *node;
fd_set rdfds, wrfds;
int max_fd = -1;
int ret;
- bool busy;
+ bool busy, progress;
+
+ progress = false;
/*
* If there are callbacks left that have been queued, we need to call then.
@@ -107,6 +110,11 @@ bool aio_wait(AioContext *ctx)
* does not need a complete flush (as is the case for qemu_aio_wait loops).
*/
if (aio_bh_poll(ctx)) {
+ blocking = false;
+ progress = true;
+ }
+
+ if (progress && !blocking) {
return true;
}
@@ -142,11 +150,11 @@ bool aio_wait(AioContext *ctx)
/* No AIO operations? Get us out of here */
if (!busy) {
- return false;
+ return progress;
}
/* wait until next event */
- ret = select(max_fd, &rdfds, &wrfds, NULL, NULL);
+ ret = select(max_fd, &rdfds, &wrfds, NULL, blocking ? NULL : &tv0);
/* if we have any readable fds, dispatch event */
if (ret > 0) {
@@ -161,11 +169,13 @@ bool aio_wait(AioContext *ctx)
if (!node->deleted &&
FD_ISSET(node->fd, &rdfds) &&
node->io_read) {
+ progress = true;
node->io_read(node->opaque);
}
if (!node->deleted &&
FD_ISSET(node->fd, &wrfds) &&
node->io_write) {
+ progress = true;
node->io_write(node->opaque);
}
@@ -181,5 +191,5 @@ bool aio_wait(AioContext *ctx)
}
}
- return true;
+ return progress;
}
diff --git a/async.c b/async.c
index c99db79..513bdd7 100644
--- a/async.c
+++ b/async.c
@@ -144,5 +144,5 @@ AioContext *aio_context_new(void)
void aio_flush(AioContext *ctx)
{
- while (aio_wait(ctx));
+ while (aio_poll(ctx, true));
}
diff --git a/main-loop.c b/main-loop.c
index 8f0117e..1fdc3bd 100644
--- a/main-loop.c
+++ b/main-loop.c
@@ -534,7 +534,7 @@ void qemu_aio_flush(void)
bool qemu_aio_wait(void)
{
- return aio_wait(qemu_aio_context);
+ return aio_poll(qemu_aio_context, true);
}
void qemu_aio_set_fd_handler(int fd,
diff --git a/qemu-aio.h b/qemu-aio.h
index f8a93d8..f19201e 100644
--- a/qemu-aio.h
+++ b/qemu-aio.h
@@ -133,13 +133,22 @@ void qemu_bh_delete(QEMUBH *bh);
* outstanding AIO operations have been completed or cancelled. */
void aio_flush(AioContext *ctx);
-/* Wait for a single AIO completion to occur. This function will wait
- * until a single AIO event has completed and it will ensure something
- * has moved before returning. This can issue new pending aio as
- * result of executing I/O completion or bh callbacks.
+/* Progress in completing AIO work to occur. This can issue new pending
+ * aio as a result of executing I/O completion or bh callbacks.
*
- * Return whether there is still any pending AIO operation. */
-bool aio_wait(AioContext *ctx);
+ * If there is no pending AIO operation or completion (bottom half),
+ * return false. If there are pending bottom halves, return true.
+ *
+ * If there are no pending bottom halves, but there are pending AIO
+ * operations, it may not be possible to make any progress without
+ * blocking. If @blocking is true, this function will wait until one
+ * or more AIO events have completed, to ensure something has moved
+ * before returning.
+ *
+ * If @blocking is false, this function will also return false if the
+ * function cannot make any progress without blocking.
+ */
+bool aio_poll(AioContext *ctx, bool blocking);
#ifdef CONFIG_POSIX
/* Returns 1 if there are still outstanding AIO requests; 0 otherwise */
--
1.7.12.1
- [Qemu-devel] [PATCH v2 05/39] fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c, (continued)
- [Qemu-devel] [PATCH v2 05/39] fdsets: use weak aliases instead of qemu-tool.c/qemu-user.c, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 06/39] iohandler: add weak alias in qemu-sockets.c, for qemu-ga, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 07/39] win32: add weak version of qemu_fd_register, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 08/39] qemu-timer: make initialization functions idempotent, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 09/39] main-loop: unify qemu_init_main_loop between QEMU and tools, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 10/39] qemu-tool: do not depend on qemu-timer.c, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 11/39] build: opts-visitor is not really part of QAPI, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 12/39] build: do not include main loop where it is not actually used, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 17/39] aio: provide platform-independent API, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 20/39] aio: test node->deleted before calling io_flush, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 21/39] aio: add non-blocking variant of aio_wait,
Paolo Bonzini <=
- [Qemu-devel] [PATCH v2 23/39] aio: add Win32 implementation, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 22/39] aio: prepare for introducing GSource-based dispatch, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 25/39] aio: add aio_notify, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 24/39] aio: make AioContexts GSources, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 27/39] main-loop: use GSource to poll AIO file descriptors, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 29/39] aio: clean up now-unused functions, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 33/39] threadpool: do not take lock in event_notifier_ready, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 32/39] aio: add generic thread-pool facility, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 34/39] block: switch posix-aio-compat to threadpool, Paolo Bonzini, 2012/10/31
- [Qemu-devel] [PATCH v2 35/39] raw: merge posix-aio-compat.c into block/raw-posix.c, Paolo Bonzini, 2012/10/31