From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:33597) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eM6AQ-0003Jc-Do for qemu-devel@nongnu.org; Tue, 05 Dec 2017 00:53:19 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eM6AP-0001u2-JH for qemu-devel@nongnu.org; Tue, 05 Dec 2017 00:53:18 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60576) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eM6AP-0001tJ-Cu for qemu-devel@nongnu.org; Tue, 05 Dec 2017 00:53:17 -0500 From: Peter Xu Date: Tue, 5 Dec 2017 13:51:43 +0800 Message-Id: <20171205055200.16305-10-peterx@redhat.com> In-Reply-To: <20171205055200.16305-1-peterx@redhat.com> References: <20171205055200.16305-1-peterx@redhat.com> Subject: [Qemu-devel] [RFC v5 09/26] monitor: create monitor dedicate iothread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Stefan Hajnoczi , "Daniel P . Berrange" , Paolo Bonzini , Fam Zheng , Juan Quintela , mdroth@linux.vnet.ibm.com, peterx@redhat.com, Eric Blake , Laurent Vivier , Markus Armbruster , marcandre.lureau@redhat.com, "Dr . David Alan Gilbert" Create one IOThread for the monitors, prepared to handle all the input/output IOs using existing iothread framework. Signed-off-by: Peter Xu --- monitor.c | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/monitor.c b/monitor.c index a70ab5606b..6b60f6d91b 100644 --- a/monitor.c +++ b/monitor.c @@ -76,6 +76,7 @@ #include "qmp-introspect.h" #include "sysemu/qtest.h" #include "sysemu/cpus.h" +#include "sysemu/iothread.h" #include "qemu/cutils.h" #include "qapi/qmp/dispatch.h" @@ -208,6 +209,12 @@ struct Monitor { QTAILQ_ENTRY(Monitor) entry; }; +struct MonitorGlobal { + IOThread *mon_iothread; +}; + +static struct MonitorGlobal mon_global; + /* QMP checker flags */ #define QMP_ACCEPT_UNKNOWNS 1 @@ -4034,12 +4041,24 @@ static void sortcmdlist(void) qsort((void *)info_cmds, array_num, elem_size, compare_mon_cmd); } +static GMainContext *monitor_io_context_get(void) +{ + return iothread_get_g_main_context(mon_global.mon_iothread); +} + +static void monitor_iothread_init(void) +{ + mon_global.mon_iothread = iothread_create("mon_iothread", + &error_abort); +} + void monitor_init_globals(void) { monitor_init_qmp_commands(); monitor_qapi_event_init(); sortcmdlist(); qemu_mutex_init(&monitor_lock); + monitor_iothread_init(); } /* These functions just adapt the readline interface in a typesafe way. We @@ -4117,6 +4136,16 @@ void monitor_cleanup(void) { Monitor *mon, *next; + /* + * We need to explicitly stop the iothread (but not destroy it), + * cleanup the monitor resources, then destroy the iothread. See + * again on the glib bug mentioned in 2b316774f6 for a reason. + * + * TODO: the bug is fixed in glib 2.28, so we can remove this hack + * as long as we won't support glib versions older than it. + */ + iothread_stop(mon_global.mon_iothread); + qemu_mutex_lock(&monitor_lock); QTAILQ_FOREACH_SAFE(mon, &mon_list, entry, next) { QTAILQ_REMOVE(&mon_list, mon, entry); @@ -4124,6 +4153,9 @@ void monitor_cleanup(void) g_free(mon); } qemu_mutex_unlock(&monitor_lock); + + iothread_destroy(mon_global.mon_iothread); + mon_global.mon_iothread = NULL; } QemuOptsList qemu_mon_opts = { -- 2.14.3