From patchwork Tue Jul 25 14:39:23 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: "Denis V. Lunev" X-Patchwork-Id: 9862123 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id D7CDF602B1 for ; Tue, 25 Jul 2017 14:40:50 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C6AD9285DB for ; Tue, 25 Jul 2017 14:40:50 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id BB72628696; Tue, 25 Jul 2017 14:40:50 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id 09CB828694 for ; Tue, 25 Jul 2017 14:40:49 +0000 (UTC) Received: from localhost ([::1]:32920 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da10y-0000Hm-LP for patchwork-qemu-devel@patchwork.kernel.org; Tue, 25 Jul 2017 10:40:48 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35715) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1da0zu-0000Gn-5G for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:39:43 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1da0zp-0008HV-8b for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:39:42 -0400 Received: from mailhub.sw.ru ([195.214.232.25]:8808 helo=relay.sw.ru) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1da0zo-0008FA-Tt for qemu-devel@nongnu.org; Tue, 25 Jul 2017 10:39:37 -0400 Received: from localhost.localdomain (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v6PEdOwx014565; Tue, 25 Jul 2017 17:39:26 +0300 (MSK) From: "Denis V. Lunev" To: qemu-devel@nongnu.org Date: Tue, 25 Jul 2017 17:39:23 +0300 Message-Id: <20170725143923.11241-1-den@openvz.org> X-Mailer: git-send-email 2.11.0 MIME-Version: 1.0 X-MIME-Autoconverted: from 8bit to quoted-printable by relay.sw.ru id v6PEdOwx014565 X-detected-operating-system: by eggs.gnu.org: OpenBSD 3.x [fuzzy] X-Received-From: 195.214.232.25 Subject: [Qemu-devel] [PATCH v2 1/1] monitor: improve tracing in handle_qmp_command X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: den@openvz.org, Markus Armbruster , =?UTF-8?q?Llu=C3=ADs=20Vilanova?= , Stefan Hajnoczi , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP Calculate req_json only if trace_handle_qmp_command enabled. Signed-off-by: Denis V. Lunev CC: Stefan Hajnoczi CC: Lluís Vilanova CC: Dr. David Alan Gilbert CC: Markus Armbruster Reviewed-by: Eric Blake --- Changes from v1: - written in the explicit for, as discussed in the mailing list monitor.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/monitor.c b/monitor.c index d8ac20f6ca..2bfeb9bbcc 100644 --- a/monitor.c +++ b/monitor.c @@ -3822,7 +3822,6 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) QDict *qdict = NULL; Monitor *mon = cur_mon; Error *err = NULL; - QString *req_json; req = json_parser_parse_err(tokens, NULL, &err); if (!req && !err) { @@ -3840,9 +3839,11 @@ static void handle_qmp_command(JSONMessageParser *parser, GQueue *tokens) qdict_del(qdict, "id"); } /* else will fail qmp_dispatch() */ - req_json = qobject_to_json(req); - trace_handle_qmp_command(mon, qstring_get_str(req_json)); - qobject_decref(QOBJECT(req_json)); + if (trace_event_get_state(TRACE_HANDLE_QMP_COMMAND)) { + QString *req_json = qobject_to_json(req); + trace_handle_qmp_command(mon, qstring_get_str(req_json)); + qobject_decref(QOBJECT(req_json)); + } rsp = qmp_dispatch(cur_mon->qmp.commands, req);