From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:51519) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1diJGr-0005ZW-N3 for qemu-devel@nongnu.org; Thu, 17 Aug 2017 07:47:30 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1diJGn-0003yC-0y for qemu-devel@nongnu.org; Thu, 17 Aug 2017 07:47:29 -0400 Received: from mx1.redhat.com ([209.132.183.28]:43004) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1diJGm-0003xx-Lq for qemu-devel@nongnu.org; Thu, 17 Aug 2017 07:47:24 -0400 References: <1502967483-4090-1-git-send-email-wang.yong155@zte.com.cn> <1502967483-4090-2-git-send-email-wang.yong155@zte.com.cn> From: Paolo Bonzini Message-ID: <13be36f3-0bdf-ea6c-69df-105f4bdedb29@redhat.com> Date: Thu, 17 Aug 2017 13:47:11 +0200 MIME-Version: 1.0 In-Reply-To: <1502967483-4090-2-git-send-email-wang.yong155@zte.com.cn> Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Subject: Re: [Qemu-devel] [PATCHv3 01/03] qemu-iothread: IOThread supports the GMainContext event loop List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Wang yong , stefanha@redhat.com, famz@redhat.com, jasowang@redhat.com, zhangchen.fnst@cn.fujitsu.com, zhang.zhanghailiang@huawei.com Cc: wang.guang55@zte.com.cn, lizhijian@cn.fujitsu.com, qemu-devel@nongnu.org On 17/08/2017 12:58, Wang yong wrote: > From: Wang Yong > > IOThread uses AioContext event loop and does not run a GMainContext. > Therefore,chardev cannot work in IOThread,such as the chardev is > used for colo-compare packets reception. > > This patch makes the IOThread run the GMainContext event loop, > chardev and IOThread can work together. > > Signed-off-by: Wang Yong > Signed-off-by: Wang Guang > --- > include/sysemu/iothread.h | 4 ++++ > iothread.c | 41 +++++++++++++++++++++++++++++++++++++++++ > 2 files changed, 45 insertions(+) > > diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h > index e6da1a4..d2985b3 100644 > --- a/include/sysemu/iothread.h > +++ b/include/sysemu/iothread.h > @@ -24,6 +24,9 @@ typedef struct { > > QemuThread thread; > AioContext *ctx; > + GMainContext *worker_context; > + GMainLoop *main_loop; > + GOnce once; > QemuMutex init_done_lock; > QemuCond init_done_cond; /* is thread initialization done? */ > bool stopping; > @@ -41,5 +44,6 @@ typedef struct { > char *iothread_get_id(IOThread *iothread); > AioContext *iothread_get_aio_context(IOThread *iothread); > void iothread_stop_all(void); > +GMainContext *iothread_get_g_main_context(IOThread *iothread); > > #endif /* IOTHREAD_H */ > diff --git a/iothread.c b/iothread.c > index beeb870..80ef830 100644 > --- a/iothread.c > +++ b/iothread.c > @@ -57,6 +57,20 @@ static void *iothread_run(void *opaque) > > while (!atomic_read(&iothread->stopping)) { > aio_poll(iothread->ctx, true); > + > + if (atomic_read(&iothread->worker_context)) { > + g_main_context_push_thread_default(iothread->worker_context); > + iothread->main_loop = > + g_main_loop_new(iothread->worker_context, TRUE); > + g_main_loop_run(iothread->main_loop); > + > + g_main_loop_unref(iothread->main_loop); > + iothread->main_loop = NULL; > + > + g_main_context_pop_thread_default(iothread->worker_context); > + g_main_context_unref(iothread->worker_context); > + iothread->worker_context = NULL; > + } > } > > rcu_unregister_thread(); > @@ -73,6 +87,9 @@ static int iothread_stop(Object *object, void *opaque) > } > iothread->stopping = true; > aio_notify(iothread->ctx); > + if (atomic_read(&iothread->main_loop)) { > + g_main_loop_quit(iothread->main_loop); > + } > qemu_thread_join(&iothread->thread); > return 0; > } > @@ -125,6 +142,7 @@ static void iothread_complete(UserCreatable *obj, Error **errp) > > qemu_mutex_init(&iothread->init_done_lock); > qemu_cond_init(&iothread->init_done_cond); > + iothread->once = (GOnce) G_ONCE_INIT; > > /* This assumes we are called from a thread with useful CPU affinity for us > * to inherit. > @@ -309,3 +327,26 @@ void iothread_stop_all(void) > > object_child_foreach(container, iothread_stop, NULL); > } > + > +static gpointer iothread_g_main_context_init(gpointer opaque) > +{ > + AioContext *ctx; > + IOThread *iothread = opaque; > + GSource *source; > + > + iothread->worker_context = g_main_context_new(); > + > + ctx = iothread_get_aio_context(iothread); > + source = aio_get_g_source(ctx); > + g_source_attach(source, iothread->worker_context); > + g_source_unref(source); You still need aio_notify, so that the aio_poll call in iothread_run exits. Paolo > + return NULL; > +} > + > +GMainContext *iothread_get_g_main_context(IOThread *iothread) > +{ > + g_once(&iothread->once, iothread_g_main_context_init, iothread); > + > + return iothread->worker_context; > +} >