iothread: push gcontext earlier in the thread_fn

We were pushing the context until right before running the gmainloop.
Now since we have everything unconditionally, we can move this
earlier.

One benefit is that now it's done even before init_done_sem, so as
long as the iothread user calls iothread_create() and completes, we
know that the thread stack is ready.

Signed-off-by: Peter Xu <peterx@redhat.com>
Message-id: 20190306115532.23025-5-peterx@redhat.com
Message-Id: <20190306115532.23025-5-peterx@redhat.com>

[Tweaked comment wording as discussed with Peter Xu.
--Stefan]

Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
This commit is contained in:
Peter Xu 2019-03-06 19:55:31 +08:00 committed by Stefan Hajnoczi
parent 0bd2d233c6
commit b60ec76a13
1 changed files with 6 additions and 3 deletions

View File

@ -53,7 +53,11 @@ static void *iothread_run(void *opaque)
IOThread *iothread = opaque;
rcu_register_thread();
/*
* g_main_context_push_thread_default() must be called before anything
* in this new thread uses glib.
*/
g_main_context_push_thread_default(iothread->worker_context);
my_iothread = iothread;
iothread->thread_id = qemu_get_thread_id();
qemu_sem_post(&iothread->init_done_sem);
@ -66,12 +70,11 @@ static void *iothread_run(void *opaque)
* changed in previous aio_poll()
*/
if (iothread->running && atomic_read(&iothread->run_gcontext)) {
g_main_context_push_thread_default(iothread->worker_context);
g_main_loop_run(iothread->main_loop);
g_main_context_pop_thread_default(iothread->worker_context);
}
}
g_main_context_pop_thread_default(iothread->worker_context);
rcu_unregister_thread();
return NULL;
}