[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v6 09/27] monitor: create monitor dedicate iothread
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v6 09/27] monitor: create monitor dedicate iothread |
Date: |
Tue, 19 Dec 2017 16:45:39 +0800 |
Create one IOThread for the monitors, prepared to handle all the
input/output IOs using existing iothread framework.
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 29 +++++++++++++++++++++++++++++
1 file changed, 29 insertions(+)
diff --git a/monitor.c b/monitor.c
index 95fc54d97f..4ebd83fd94 100644
--- a/monitor.c
+++ b/monitor.c
@@ -75,6 +75,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"
@@ -207,6 +208,11 @@ struct Monitor {
QTAILQ_ENTRY(Monitor) entry;
};
+/* Let's add monitor global variables to this struct. */
+static struct {
+ IOThread *mon_iothread;
+} mon_global;
+
/* QMP checker flags */
#define QMP_ACCEPT_UNKNOWNS 1
@@ -4034,12 +4040,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 +4135,14 @@ 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 since
+ * we need to unregister from chardev below in
+ * monitor_data_destroy(), and chardev is not thread-safe yet
+ */
+ 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.14.3
- Re: [Qemu-devel] [RFC v6 01/27] chardev: use backend chr context when watch for fe, (continued)
- [Qemu-devel] [RFC v6 02/27] qobject: introduce qstring_get_try_str(), Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 03/27] qobject: introduce qobject_get_try_str(), Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 04/27] qobject: let object_property_get_str() use new API, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 05/27] monitor: move skip_flush into monitor_data_init, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 06/27] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 07/27] monitor: unify global init, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 08/27] monitor: let mon_list be tail queue, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 09/27] monitor: create monitor dedicate iothread,
Peter Xu <=
- [Qemu-devel] [RFC v6 10/27] monitor: allow to use IO thread for parsing, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 11/27] qmp: introduce QMPCapability, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 12/27] qmp: negotiate QMP capabilities, Peter Xu, 2017/12/19
- [Qemu-devel] [RFC v6 13/27] monitor: introduce monitor_qmp_respond(), Peter Xu, 2017/12/19