[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [RFC v5 09/26] monitor: create monitor dedicate iothread
From: |
Peter Xu |
Subject: |
[Qemu-devel] [RFC v5 09/26] monitor: create monitor dedicate iothread |
Date: |
Tue, 5 Dec 2017 13:51:43 +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 | 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
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, (continued)
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Stefan Hajnoczi, 2017/12/13
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Peter Xu, 2017/12/15
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Stefan Hajnoczi, 2017/12/15
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Peter Xu, 2017/12/15
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Stefan Hajnoczi, 2017/12/16
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Peter Xu, 2017/12/17
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Stefan Hajnoczi, 2017/12/18
- Re: [Qemu-devel] [RFC v5 07/26] monitor: unify global init, Peter Xu, 2017/12/18
[Qemu-devel] [RFC v5 08/26] monitor: let mon_list be tail queue, Peter Xu, 2017/12/05
[Qemu-devel] [RFC v5 09/26] monitor: create monitor dedicate iothread,
Peter Xu <=
[Qemu-devel] [RFC v5 10/26] monitor: allow to use IO thread for parsing, Peter Xu, 2017/12/05
[Qemu-devel] [RFC v5 11/26] qmp: introduce QMPCapability, Peter Xu, 2017/12/05