[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 5/7] iothread: create main loop unconditionally
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 5/7] iothread: create main loop unconditionally |
Date: |
Fri, 8 Mar 2019 16:53:42 +0000 |
From: Peter Xu <address@hidden>
Since we've have the gcontext always there, create the main loop
altogether. The iothread_run() is even cleaner.
Reviewed-by: Marc-André Lureau <address@hidden>
Signed-off-by: Peter Xu <address@hidden>
Message-id: address@hidden
Message-Id: <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
iothread.c | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/iothread.c b/iothread.c
index 6fa87876e0..9abdbace66 100644
--- a/iothread.c
+++ b/iothread.c
@@ -66,17 +66,8 @@ static void *iothread_run(void *opaque)
* changed in previous aio_poll()
*/
if (iothread->running && atomic_read(&iothread->run_gcontext)) {
- GMainLoop *loop;
-
g_main_context_push_thread_default(iothread->worker_context);
- iothread->main_loop =
- g_main_loop_new(iothread->worker_context, TRUE);
- loop = iothread->main_loop;
-
g_main_loop_run(iothread->main_loop);
- iothread->main_loop = NULL;
- g_main_loop_unref(loop);
-
g_main_context_pop_thread_default(iothread->worker_context);
}
}
@@ -141,6 +132,8 @@ static void iothread_instance_finalize(Object *obj)
if (iothread->worker_context) {
g_main_context_unref(iothread->worker_context);
iothread->worker_context = NULL;
+ g_main_loop_unref(iothread->main_loop);
+ iothread->main_loop = NULL;
}
qemu_sem_destroy(&iothread->init_done_sem);
}
@@ -153,6 +146,7 @@ static void iothread_init_gcontext(IOThread *iothread)
source = aio_get_g_source(iothread_get_aio_context(iothread));
g_source_attach(source, iothread->worker_context);
g_source_unref(source);
+ iothread->main_loop = g_main_loop_new(iothread->worker_context, TRUE);
}
static void iothread_complete(UserCreatable *obj, Error **errp)
--
2.20.1
- [Qemu-devel] [PULL 0/7] Block patches, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 1/7] MAINTAINERS: add missing support status fields, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 2/7] hw/block/virtio-blk: Clean req->dev repetitions, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 3/7] iothread: replace init_done_cond with a semaphore, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 4/7] iothread: create the gcontext unconditionally, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 5/7] iothread: create main loop unconditionally,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 6/7] iothread: push gcontext earlier in the thread_fn, Stefan Hajnoczi, 2019/03/08
- [Qemu-devel] [PULL 7/7] iothread: document about why we need explicit aio_poll(), Stefan Hajnoczi, 2019/03/08
- Re: [Qemu-devel] [PULL 0/7] Block patches, Peter Maydell, 2019/03/09