@@ -17,6 +17,7 @@
#include "block/block.h"
#include "qemu/queue.h"
#include "qemu/sockets.h"
+#include "qemu/rcu.h"
struct AioHandler
{
@@ -232,9 +233,15 @@ bool aio_poll(AioContext *ctx, bool blocking)
}
/* wait until next event */
+ if (blocking) {
+ rcu_thread_offline();
+ }
ret = g_poll((GPollFD *)ctx->pollfds->data,
ctx->pollfds->len,
blocking ? -1 : 0);
+ if (blocking) {
+ rcu_thread_online();
+ }
/* if we have any readable fds, dispatch event */
if (ret > 0) {
@@ -19,6 +19,7 @@
#include "block/block.h"
#include "qemu/queue.h"
#include "qemu/sockets.h"
+#include "qemu/rcu.h"
struct AioHandler {
EventNotifier *e;
@@ -175,7 +176,14 @@ bool aio_poll(AioContext *ctx, bool blocking)
/* wait until next event */
while (count > 0) {
int timeout = blocking ? INFINITE : 0;
- int ret = WaitForMultipleObjects(count, events, FALSE, timeout);
+
+ if (timeout) {
+ rcu_thread_offline();
+ }
+ ret = WaitForMultipleObjects(count, events, FALSE, timeout);
+ if (timeout) {
+ rcu_thread_online();
+ }
/* if we have any signaled events, dispatch event */
if ((DWORD) (ret - WAIT_OBJECT_0) >= count) {
@@ -27,6 +27,7 @@
#include "slirp/slirp.h"
#include "qemu/main-loop.h"
#include "block/aio.h"
+#include "qemu/rcu.h"
#ifndef _WIN32
@@ -219,6 +220,7 @@ static int os_host_main_loop_wait(uint32_t timeout)
if (timeout > 0) {
spin_counter = 0;
qemu_mutex_unlock_iothread();
+ rcu_thread_offline();
} else {
spin_counter++;
}
@@ -226,6 +228,7 @@ static int os_host_main_loop_wait(uint32_t timeout)
ret = g_poll((GPollFD *)gpollfds->data, gpollfds->len, timeout);
if (timeout > 0) {
+ rcu_thread_online();
qemu_mutex_lock_iothread();
}
@@ -409,7 +412,9 @@ static int os_host_main_loop_wait(uint32_t timeout)
}
qemu_mutex_unlock_iothread();
+ rcu_thread_offline();
g_poll_ret = g_poll(poll_fds, n_poll_fds + w->num, poll_timeout);
+ rcu_thread_online();
qemu_mutex_lock_iothread();
if (g_poll_ret > 0) {
for (i = 0; i < w->num; i++) {
Threads that run event loops also have places that can sleep for an extended time. Place an extended quiescent state there. Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> --- aio-posix.c | 7 +++++++ aio-win32.c | 10 +++++++++- main-loop.c | 5 +++++ 3 files changed, 21 insertions(+), 1 deletion(-)