[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v2 09/22] monitor: create monitor dedicate iothread
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v2 09/22] monitor: create monitor dedicate iothread |
Date: |
Fri, 29 Sep 2017 11:38:31 +0800 |
Create one IO thread for the monitors, prepared to handle all the
input/output IOs using existing iothread framework.
Signed-off-by: Peter Xu <address@hidden>
---
monitor.c | 39 +++++++++++++++++++++++++++++++++++++++
1 file changed, 39 insertions(+)
diff --git a/monitor.c b/monitor.c
index 9a8482a962..b44e1f6c86 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 {
QLIST_ENTRY(Monitor) entry;
};
+struct MonitorGlobal {
+ IOThread *mon_io_thread;
+};
+
+static struct MonitorGlobal mon_global;
+
/* QMP checker flags */
#define QMP_ACCEPT_UNKNOWNS 1
@@ -4047,12 +4054,29 @@ 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_io_thread);
+}
+
+static void monitor_io_thread_init(void)
+{
+ mon_global.mon_io_thread = iothread_create("monitor_io_thr",
+ &error_abort);
+ /*
+ * Gcontext in iothread is using lazy init - the first time we
+ * fetch the context we'll have that initialized.
+ */
+ monitor_io_context_get();
+}
+
void monitor_init_globals(void)
{
monitor_init_qmp_commands();
monitor_qapi_event_init();
sortcmdlist();
qemu_mutex_init(&monitor_lock);
+ monitor_io_thread_init();
}
/* These functions just adapt the readline interface in a typesafe way. We
@@ -4126,10 +4150,23 @@ void monitor_init(Chardev *chr, int flags)
qemu_mutex_unlock(&monitor_lock);
}
+static void monitor_io_thread_destroy(void)
+{
+ iothread_destroy(mon_global.mon_io_thread);
+ mon_global.mon_io_thread = NULL;
+}
+
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.
+ */
+ iothread_stop(mon_global.mon_io_thread);
+
qemu_mutex_lock(&monitor_lock);
QLIST_FOREACH_SAFE(mon, &mon_list, entry, next) {
QLIST_REMOVE(mon, entry);
@@ -4137,6 +4174,8 @@ void monitor_cleanup(void)
g_free(mon);
}
qemu_mutex_unlock(&monitor_lock);
+
+ monitor_io_thread_destroy();
}
QemuOptsList qemu_mon_opts = {
--
2.13.5
- [Qemu-devel] [RFC v2 00/22] QMP: out-of-band (OOB) execution support, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 01/22] char-io: fix possible race on IOWatchPoll, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 02/22] qobject: introduce qstring_get_try_str(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 03/22] qobject: introduce qobject_get_try_str(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 04/22] qobject: let object_property_get_str() use new API, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 05/22] monitor: move skip_flush into monitor_data_init, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 06/22] qjson: add "opaque" field to JSONMessageParser, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 08/22] monitor: unify global init, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 07/22] monitor: move the cur_mon hack deeper for QMP, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 09/22] monitor: create monitor dedicate iothread,
Peter Xu <=
- [Qemu-devel] [RFC v2 10/22] monitor: allow to use IO thread for parsing, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 11/22] monitor: introduce monitor_qmp_respond(), Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 12/22] monitor: let mon_list be tail queue, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 13/22] monitor: separate QMP parser and dispatcher, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 14/22] qmp: add new event "request-dropped", Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 15/22] monitor: send event when request queue full, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 16/22] monitor: enable IO thread for (qmp & !mux) typed, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 17/22] qapi: introduce new cmd option "allow-oob", Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 18/22] qmp: support out-of-band (oob) execution, Peter Xu, 2017/09/28
- [Qemu-devel] [RFC v2 19/22] qmp: let migrate-incoming allow out-of-band, Peter Xu, 2017/09/28