From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:55691) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eHp1m-0003mj-7K for qemu-devel@nongnu.org; Thu, 23 Nov 2017 05:46:48 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eHp1j-0001K2-1P for qemu-devel@nongnu.org; Thu, 23 Nov 2017 05:46:42 -0500 Received: from mx1.redhat.com ([209.132.183.28]:55606) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1eHp1i-0001Jf-OC for qemu-devel@nongnu.org; Thu, 23 Nov 2017 05:46:38 -0500 Date: Thu, 23 Nov 2017 10:46:25 +0000 From: "Dr. David Alan Gilbert" Message-ID: <20171123104625.GA2462@work-vm> References: <20171116130610.23582-1-peterx@redhat.com> <20171116130610.23582-10-peterx@redhat.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20171116130610.23582-10-peterx@redhat.com> Subject: Re: [Qemu-devel] [RFC v4 09/27] monitor: create monitor dedicate iothread List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: Peter Xu Cc: qemu-devel@nongnu.org, Stefan Hajnoczi , "Daniel P . Berrange" , Paolo Bonzini , Fam Zheng , Juan Quintela , mdroth@linux.vnet.ibm.com, Eric Blake , Laurent Vivier , Markus Armbruster , marcandre.lureau@redhat.com * Peter Xu (peterx@redhat.com) wrote: > 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 | 29 +++++++++++++++++++++++++++++ > 1 file changed, 29 insertions(+) > > diff --git a/monitor.c b/monitor.c > index a70ab5606b..4ce9828fab 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("monitor_iothread", > + &error_abort); That name is one character too long for pthread_setname_np that it ends up being passed too (it's 16 char including the terminator); that probably means the thread ends up unnamed. I suggest you make it "mon_iothread" > +} > + > 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,13 @@ 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. I wonder if that bug is still live? 2b316774f6 says that: 'glib developers found and fixed the deadlock as part of implementing child sources.' but doesn't say which glib version that was fixed in; we have increased the minimum glib version we support since 2013, so maybe... Dave > + */ > + 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 +4150,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.13.6 > -- Dr. David Alan Gilbert / dgilbert@redhat.com / Manchester, UK