From nobody Mon Apr 29 09:53:39 2024 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 150278255084686.66885508711584; Tue, 15 Aug 2017 00:35:50 -0700 (PDT) Received: from localhost ([::1]:44063 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhWOD-0004dz-Lk for importer@patchew.org; Tue, 15 Aug 2017 03:35:49 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35693) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhWNF-00042Q-CG for qemu-devel@nongnu.org; Tue, 15 Aug 2017 03:34:50 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dhWNB-0006Zm-9y for qemu-devel@nongnu.org; Tue, 15 Aug 2017 03:34:49 -0400 Received: from mxhk.zte.com.cn ([63.217.80.70]:48108 helo=zte.com.cn) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dhWNA-0006YL-Np for qemu-devel@nongnu.org; Tue, 15 Aug 2017 03:34:45 -0400 Received: from unknown (HELO mse01.zte.com.cn) (10.30.3.20) by localhost with (AES256-SHA encrypted) SMTP; 15 Aug 2017 07:28:46 -0000 Received: from notes_smtp.zte.com.cn ([10.30.1.239]) by mse01.zte.com.cn with ESMTP id v7F7SfFw070148; Tue, 15 Aug 2017 15:28:41 +0800 (GMT-8) (envelope-from wang.yong155@zte.com.cn) Received: from localhost.localdomain ([10.74.120.79]) by szsmtp06.zte.com.cn (Lotus Domino Release 8.5.3FP6) with ESMTP id 2017081515284433-626973 ; Tue, 15 Aug 2017 15:28:44 +0800 X-scanvirus: By SEG_CYREN AntiVirus Engine X-scanresult: CLEAN X-MAILFROM: X-RCPTTO: X-FROMIP: 10.30.3.20 X-SEG-Scaned: 1 X-Received: unknown,10.30.3.20,20170815152846 From: Wang yong To: pbonzini@redhat.com, stefanha@redhat.com, famz@redhat.com, jasowang@redhat.com Date: Tue, 15 Aug 2017 15:28:15 +0800 Message-Id: <1502782095-3912-1-git-send-email-wang.yong155@zte.com.cn> X-Mailer: git-send-email 1.8.3.1 X-MIMETrack: Itemize by SMTP Server on SZSMTP06/server/zte_ltd(Release 8.5.3FP6|November 21, 2013) at 2017-08-15 15:28:44, Serialize by Router on notes_smtp/zte_ltd(Release 9.0.1FP7|August 17, 2016) at 2017-08-15 15:28:37, Serialize complete at 2017-08-15 15:28:37 X-MAIL: mse01.zte.com.cn v7F7SfFw070148 X-HQIP: 127.0.0.1 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x [fuzzy] X-Received-From: 63.217.80.70 Subject: [Qemu-devel] [PATCH v2] qemu-iothread: IOThread supports the GMainContext event loop X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: zhang.zhanghailiang@huawei.com, lizhijian@cn.fujitsu.com, wang.guang55@zte.com.cn, qemu-devel@nongnu.org, zhangchen.fnst@cn.fujitsu.com, wang.yong155@zte.com.cn Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 | 10 +++++++++ iothread.c | 54 +++++++++++++++++++++++++++++++++++++++++++= ++++ 2 files changed, 64 insertions(+) diff --git a/include/sysemu/iothread.h b/include/sysemu/iothread.h index e6da1a4..89e913c 100644 --- a/include/sysemu/iothread.h +++ b/include/sysemu/iothread.h @@ -20,10 +20,19 @@ #define TYPE_IOTHREAD "iothread" =20 typedef struct { + GMainContext *worker_context; + GMainLoop *main_loop; + GOnce once; + + QEMUBH *bh; +} GMainOnce; + +typedef struct { Object parent_obj; =20 QemuThread thread; AioContext *ctx; + GMainOnce thread_gonce; QemuMutex init_done_lock; QemuCond init_done_cond; /* is thread initialization done? */ bool stopping; @@ -41,5 +50,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); =20 #endif /* IOTHREAD_H */ diff --git a/iothread.c b/iothread.c index beeb870..9995eb0 100644 --- a/iothread.c +++ b/iothread.c @@ -72,6 +72,9 @@ static int iothread_stop(Object *object, void *opaque) return 0; } iothread->stopping =3D true; + if (iothread->thread_gonce.main_loop) { + g_main_loop_quit(iothread->thread_gonce.main_loop); + } aio_notify(iothread->ctx); qemu_thread_join(&iothread->thread); return 0; @@ -125,6 +128,7 @@ static void iothread_complete(UserCreatable *obj, Error= **errp) =20 qemu_mutex_init(&iothread->init_done_lock); qemu_cond_init(&iothread->init_done_cond); + iothread->thread_gonce.once =3D (GOnce) G_ONCE_INIT; =20 /* This assumes we are called from a thread with useful CPU affinity f= or us * to inherit. @@ -309,3 +313,53 @@ void iothread_stop_all(void) =20 object_child_foreach(container, iothread_stop, NULL); } + +static void iothread_g_main_context_bh(void *opaque) +{ + GMainOnce *g =3D opaque; + + qemu_bh_delete(g->bh); + g->bh =3D NULL; + + g_main_context_push_thread_default(g->worker_context); + + g->main_loop =3D g_main_loop_new(g->worker_context, TRUE); + g_main_loop_run(g->main_loop); + + g_main_loop_unref(g->main_loop); + g->main_loop =3D NULL; + + g_main_context_pop_thread_default(g->worker_context); + g_main_context_unref(g->worker_context); + g->worker_context =3D NULL; +} + +static gpointer iothread_g_main_context_init(gpointer g_data) +{ + AioContext *ctx; + IOThread *iothread =3D (IOThread *)g_data; + GMainOnce *g =3D &iothread->thread_gonce; + GSource *source; + + g->worker_context =3D g_main_context_new(); + + ctx =3D iothread_get_aio_context(iothread); + source =3D aio_get_g_source(ctx); + g_source_attach(source, g->worker_context); + g_source_unref(source); + + g->bh =3D aio_bh_new(ctx, + iothread_g_main_context_bh, g); + qemu_bh_schedule(g->bh); + + return (gpointer) g->worker_context; +} + +GMainContext *iothread_get_g_main_context(IOThread *iothread) +{ + GMainOnce *g =3D &iothread->thread_gonce; + + g_once(&g->once, iothread_g_main_context_init, iothread); + + return (GMainContext *) g->once.retval; +} --=20 1.8.3.1