From nobody Wed Nov 5 10:16:03 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; dmarc=fail(p=none dis=none) header.from=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1535043032418245.02894278292945; Thu, 23 Aug 2018 09:50:32 -0700 (PDT) Received: from localhost ([::1]:37741 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fssoZ-0003uN-Bq for importer@patchew.org; Thu, 23 Aug 2018 12:50:31 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:32795) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1fssgL-0003T9-38 for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:42:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1fssev-0003cL-NR for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:40:36 -0400 Received: from mx3-rdu2.redhat.com ([66.187.233.73]:44760 helo=mx1.redhat.com) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1fssev-0003b3-7c for qemu-devel@nongnu.org; Thu, 23 Aug 2018 12:40:33 -0400 Received: from smtp.corp.redhat.com (int-mx05.intmail.prod.int.rdu2.redhat.com [10.11.54.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id A8B8040216EC; Thu, 23 Aug 2018 16:40:32 +0000 (UTC) Received: from blackfin.pond.sub.org (ovpn-116-97.ams2.redhat.com [10.36.116.97]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 80FFAA9EF6; Thu, 23 Aug 2018 16:40:32 +0000 (UTC) Received: by blackfin.pond.sub.org (Postfix, from userid 1000) id 26B45110E7F9; Thu, 23 Aug 2018 18:40:26 +0200 (CEST) From: Markus Armbruster To: qemu-devel@nongnu.org Date: Thu, 23 Aug 2018 18:39:59 +0200 Message-Id: <20180823164025.12553-33-armbru@redhat.com> In-Reply-To: <20180823164025.12553-1-armbru@redhat.com> References: <20180823164025.12553-1-armbru@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.11.54.5 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 16:40:32 +0000 (UTC) X-Greylist: inspected by milter-greylist-4.5.16 (mx1.redhat.com [10.11.55.5]); Thu, 23 Aug 2018 16:40:32 +0000 (UTC) for IP:'10.11.54.5' DOMAIN:'int-mx05.intmail.prod.int.rdu2.redhat.com' HELO:'smtp.corp.redhat.com' FROM:'armbru@redhat.com' RCPT:'' Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 66.187.233.73 Subject: [Qemu-devel] [PATCH v3 32/58] json-parser: simplify and avoid JSONParserContext allocation 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: marcandre.lureau@redhat.com, mdroth@linux.vnet.ibm.com Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RDMRC_1 RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" From: Marc-Andr=C3=A9 Lureau parser_context_new/free() are only used from json_parser_parse(). We can fold the code there and avoid an allocation altogether. Signed-off-by: Marc-Andr=C3=A9 Lureau Message-Id: <20180719184111.5129-9-marcandre.lureau@redhat.com> Reviewed-by: Markus Armbruster --- qobject/json-parser.c | 41 +++++++++-------------------------------- 1 file changed, 9 insertions(+), 32 deletions(-) diff --git a/qobject/json-parser.c b/qobject/json-parser.c index 73e6ad7458..7bfa08200c 100644 --- a/qobject/json-parser.c +++ b/qobject/json-parser.c @@ -237,33 +237,6 @@ static JSONToken *parser_context_peek_token(JSONParser= Context *ctxt) return g_queue_peek_head(ctxt->buf); } =20 -static JSONParserContext *parser_context_new(GQueue *tokens) -{ - JSONParserContext *ctxt; - - if (!tokens) { - return NULL; - } - - ctxt =3D g_malloc0(sizeof(JSONParserContext)); - ctxt->buf =3D tokens; - - return ctxt; -} - -/* to support error propagation, ctxt->err must be freed separately */ -static void parser_context_free(JSONParserContext *ctxt) -{ - if (ctxt) { - while (!g_queue_is_empty(ctxt->buf)) { - parser_context_pop_token(ctxt); - } - g_free(ctxt->current); - g_queue_free(ctxt->buf); - g_free(ctxt); - } -} - /** * Parsing rules */ @@ -575,18 +548,22 @@ QObject *json_parser_parse(GQueue *tokens, va_list *a= p) =20 QObject *json_parser_parse_err(GQueue *tokens, va_list *ap, Error **errp) { - JSONParserContext *ctxt =3D parser_context_new(tokens); + JSONParserContext ctxt =3D { .buf =3D tokens }; QObject *result; =20 - if (!ctxt) { + if (!tokens) { return NULL; } =20 - result =3D parse_value(ctxt, ap); + result =3D parse_value(&ctxt, ap); =20 - error_propagate(errp, ctxt->err); + error_propagate(errp, ctxt.err); =20 - parser_context_free(ctxt); + while (!g_queue_is_empty(ctxt.buf)) { + parser_context_pop_token(&ctxt); + } + g_free(ctxt.current); + g_queue_free(ctxt.buf); =20 return result; } --=20 2.17.1