From patchwork Wed Nov 30 19:44:48 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 9454801 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 808926071E for ; Wed, 30 Nov 2016 20:05:59 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7254B2849F for ; Wed, 30 Nov 2016 20:05:59 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 6614C284A2; Wed, 30 Nov 2016 20:05:59 +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 11FEF2849F for ; Wed, 30 Nov 2016 20:05:59 +0000 (UTC) Received: from localhost ([::1]:46168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCB8g-0003Rg-4F for patchwork-qemu-devel@patchwork.kernel.org; Wed, 30 Nov 2016 15:05:58 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35856) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1cCAoy-00046t-Aq for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:37 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1cCAou-00025J-Me for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:36 -0500 Received: from mx1.redhat.com ([209.132.183.28]:52908) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1cCAou-00024j-8d for qemu-devel@nongnu.org; Wed, 30 Nov 2016 14:45:32 -0500 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 22296C04B95F for ; Wed, 30 Nov 2016 19:45:31 +0000 (UTC) Received: from red.redhat.com (ovpn-116-172.phx2.redhat.com [10.3.116.172]) by int-mx14.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id uAUJj2nb025934; Wed, 30 Nov 2016 14:45:30 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 30 Nov 2016 13:44:48 -0600 Message-Id: <1480535094-23831-31-git-send-email-eblake@redhat.com> In-Reply-To: <1480535094-23831-1-git-send-email-eblake@redhat.com> References: <1480535094-23831-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.27 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 30 Nov 2016 19:45:31 +0000 (UTC) X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PATCH 30/36] qtest: Avoid dynamic JSON in qmp_fd_sendv() 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: pbonzini@redhat.com, armbru@redhat.com Errors-To: qemu-devel-bounces+patchwork-qemu-devel=patchwork.kernel.org@nongnu.org Sender: "Qemu-devel" X-Virus-Scanned: ClamAV using ClamSMTP The only format specifier left in any client of qmp() and friends is %s. Rather than having to make our JSON parser support varargs, and use a conversion from string to QObject and back to string, we can instead just directly build the string and substitute %s ourselves. With this, the final caller of qobject_from_jsonv() is eliminated, and followup patches can simplify the parser. Signed-off-by: Eric Blake --- Too bad glibc's strchrnul() is not universal; also, this patch could avoid "%.*s" format shenanigans (with the nastiness of converting ptrdiff_t to int) if we want to first enhance QString to support a length-limited append primitive. --- tests/libqtest.c | 42 ++++++++++++++++++++++++++---------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/tests/libqtest.c b/tests/libqtest.c index 22bf0ad..a9559d8 100644 --- a/tests/libqtest.c +++ b/tests/libqtest.c @@ -427,27 +427,37 @@ QDict *qtest_qmp_receive(QTestState *s) */ static void qmp_fd_sendv(int fd, const char *fmt, va_list ap) { - va_list ap_copy; - QObject *qobj; + QString *qstr; - /* Going through qobject ensures we escape strings properly. - * This seemingly unnecessary copy is required in case va_list - * is an array type. + if (!strchr(fmt, '%')) { + return qmp_fd_send(fd, fmt); + } + + /* Construct a single string, turning %s in fmt into proper JSON + * strings. For now, we don't support any other format specifiers. */ - va_copy(ap_copy, ap); - qobj = qobject_from_jsonv(fmt, &ap_copy); - va_end(ap_copy); + qstr = qstring_new(); + while (*fmt) { + /* Too bad strchrnul() is not universal */ + const char *p = strchr(fmt, '%'); - /* No need to send anything for an empty QObject. */ - if (qobj) { - QString *qstr = qobject_to_json(qobj); - const char *str = qstring_get_str(qstr); + if (!p) { + p = strchr(fmt, '\0'); + } - qmp_fd_send(fd, str); - - QDECREF(qstr); - qobject_decref(qobj); + assert(p - fmt < INT_MAX); + qstring_append_printf(qstr, "%.*s", (int)(p - fmt), fmt); + if (*p) { + assert(p[1] == 's'); + p += 2; + qstring_append_json_string(qstr, va_arg(ap, const char *)); + } + fmt = p; } + + qmp_fd_send(fd, qstring_get_str(qstr)); + + QDECREF(qstr); } QDict *qtest_qmpv(QTestState *s, const char *fmt, va_list ap)