[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/32] qmp: Revert change to handle_qmp_command trac
From: |
Markus Armbruster |
Subject: |
[Qemu-devel] [PATCH 13/32] qmp: Revert change to handle_qmp_command tracepoint |
Date: |
Mon, 2 Jul 2018 18:21:59 +0200 |
Commit 71da4667db6 "monitor: separate QMP parser and dispatcher" moved
the handle_qmp_command tracepoint from handle_qmp_command() to
monitor_qmp_dispatch_one(). This delays tracing from enqueue time to
dequeue time. Revert that. Dequeue remains adequately visible via
tracepoint monitor_qmp_cmd_in_band.
Signed-off-by: Markus Armbruster <address@hidden>
---
monitor.c | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/monitor.c b/monitor.c
index 8b0c29ce06..10991757f6 100644
--- a/monitor.c
+++ b/monitor.c
@@ -4183,12 +4183,6 @@ static void monitor_qmp_dispatch_one(QMPRequest *req_obj)
g_free(req_obj);
- if (trace_event_get_state_backends(TRACE_HANDLE_QMP_COMMAND)) {
- QString *req_json = qobject_to_json(req);
- trace_handle_qmp_command(mon, qstring_get_str(req_json));
- qobject_unref(req_json);
- }
-
old_mon = cur_mon;
cur_mon = mon;
@@ -4282,6 +4276,12 @@ static void handle_qmp_command(JSONMessageParser
*parser, GQueue *tokens)
qdict_del(qdict, "id");
} /* else will fail qmp_dispatch() */
+ if (trace_event_get_state_backends(TRACE_HANDLE_QMP_COMMAND)) {
+ QString *req_json = qobject_to_json(req);
+ trace_handle_qmp_command(mon, qstring_get_str(req_json));
+ qobject_unref(req_json);
+ }
+
/* Check against the request in general layout */
qdict = qmp_dispatch_check_obj(req, qmp_oob_enabled(mon), &err);
if (!qdict) {
--
2.17.1
- Re: [Qemu-devel] [PATCH 20/32] monitor: Peel off @mon_global wrapper, (continued)
- [Qemu-devel] [PATCH 22/32] qmp: De-duplicate error response building, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 28/32] qmp: Switch timestamp_put() to qdict_from_jsonf_nofail(), Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 30/32] qmp: Clean up capability negotiation after commit 02130314d8c, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 26/32] qmp: Simplify monitor_qmp_respond(), Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 13/32] qmp: Revert change to handle_qmp_command tracepoint,
Markus Armbruster <=
- [Qemu-devel] [PATCH 01/32] qmp: Say "out-of-band" instead of "Out-Of-Band", Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 31/32] monitor: Improve some comments, Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 25/32] qmp: Replace get_qmp_greeting() by qmp_greeting(), Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 11/32] qmp qemu-ga: Fix qemu-ga not to accept "control", Markus Armbruster, 2018/07/02
- [Qemu-devel] [PATCH 29/32] qobject: Let qobject_from_jsonf() fail instead of abort, Markus Armbruster, 2018/07/02