From patchwork Thu Nov 26 00:23:16 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Blake X-Patchwork-Id: 548882 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4EEFA1402A9 for ; Thu, 26 Nov 2015 11:34:56 +1100 (AEDT) Received: from localhost ([::1]:48516 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kWU-0002Pj-Af for incoming@patchwork.ozlabs.org; Wed, 25 Nov 2015 19:34:54 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58686) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kLa-0007Hg-4G for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:39 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a1kLX-0005vi-K2 for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:38 -0500 Received: from mx1.redhat.com ([209.132.183.28]:59850) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a1kLX-0005vS-An for qemu-devel@nongnu.org; Wed, 25 Nov 2015 19:23:35 -0500 Received: from int-mx13.intmail.prod.int.phx2.redhat.com (int-mx13.intmail.prod.int.phx2.redhat.com [10.5.11.26]) by mx1.redhat.com (Postfix) with ESMTPS id EC22CA85; Thu, 26 Nov 2015 00:23:34 +0000 (UTC) Received: from red.redhat.com ([10.3.113.12]) by int-mx13.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tAQ0NOdg020886; Wed, 25 Nov 2015 19:23:34 -0500 From: Eric Blake To: qemu-devel@nongnu.org Date: Wed, 25 Nov 2015 17:23:16 -0700 Message-Id: <1448497401-27784-20-git-send-email-eblake@redhat.com> In-Reply-To: <1448497401-27784-1-git-send-email-eblake@redhat.com> References: <1448497401-27784-1-git-send-email-eblake@redhat.com> X-Scanned-By: MIMEDefang 2.68 on 10.5.11.26 X-detected-operating-system: by eggs.gnu.org: GNU/Linux 3.x X-Received-From: 209.132.183.28 Cc: armbru@redhat.com, Michael Roth Subject: [Qemu-devel] [PATCH v6 19/23] qapi-visit: Unify struct and union visit X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org We are finally at the point where gen_visit_struct() and gen_visit_union() can be unified to a generic gen_visit_object(). The generated code for structs and for flat unions is unchanged. For simple unions, a new visit_type_FOO_fields() is created, wrapping the visit of the non-variant tag field: |+static void visit_type_ChardevBackend_fields(Visitor *v, ChardevBackend **obj, Error **errp) |+{ |+ Error *err = NULL; |+ |+ visit_type_ChardevBackendKind(v, &(*obj)->type, "type", &err); |+ if (err) { |+ goto out; |+ } |+ |+out: |+ error_propagate(errp, err); |+} |+ | void visit_type_ChardevBackend(Visitor *v, ChardevBackend **obj, const char *name, Error **errp) | { | Error *err = NULL; |@@ -2319,7 +2332,7 @@ void visit_type_ChardevBackend(Visitor * | if (!*obj) { | goto out_obj; | } |- visit_type_ChardevBackendKind(v, &(*obj)->type, "type", &err); |+ visit_type_ChardevBackend_fields(v, obj, &err); | if (err) { Signed-off-by: Eric Blake --- v6: new patch --- scripts/qapi-visit.py | 133 +++++++++++++++++++------------------------------- 1 file changed, 51 insertions(+), 82 deletions(-) diff --git a/scripts/qapi-visit.py b/scripts/qapi-visit.py index 421a5b5..f22ebeb 100644 --- a/scripts/qapi-visit.py +++ b/scripts/qapi-visit.py @@ -109,46 +109,6 @@ out: return ret -def gen_visit_struct(name, base, members): - ret = gen_visit_struct_fields(name, base, members) - - # FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to - # *obj, but then visit_type_FOO_fields() fails, we should clean up *obj - # rather than leaving it non-NULL. As currently written, the caller must - # call qapi_free_FOO() to avoid a memory leak of the partial FOO. - ret += mcgen(''' - -void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) -{ - Error *err = NULL; - - visit_start_struct(v, (void **)obj, "%(name)s", name, sizeof(%(c_name)s), &err); - if (err) { - goto out; - } - if (!*obj) { - goto out_obj; - } -''', - name=name, c_name=c_name(name)) - if (base and not base.is_empty()) or members: - ret += mcgen(''' - visit_type_%(c_name)s_fields(v, obj, &err); -''', - c_name=c_name(name)) - ret += mcgen(''' -out_obj: - error_propagate(errp, err); - err = NULL; - visit_end_struct(v, &err); -out: - error_propagate(errp, err); -} -''') - - return ret - - def gen_visit_list(name, element_type): # FIXME: if *obj is NULL on entry, and the first visit_next_list() # assigns to *obj, while a later one fails, we should clean up *obj @@ -244,18 +204,24 @@ out: return ret -def gen_visit_union(name, base, variants): +def gen_visit_object(name, base, members, variants): ret = '' assert base if not base.is_empty(): ret += gen_visit_fields_decl(base) + if members: + ret += gen_visit_struct_fields(name, base, members) + if variants: + for var in variants.variants: + # Ugly special case for simple union TODO get rid of it + if not var.simple_union_type(): + ret += gen_visit_implicit_struct(var.type) - for var in variants.variants: - # Ugly special case for simple union TODO get rid of it - if not var.simple_union_type(): - ret += gen_visit_implicit_struct(var.type) - + # FIXME: if *obj is NULL on entry, and visit_start_struct() assigns to + # *obj, but then visit_type_FOO_fields() fails, we should clean up *obj + # rather than leaving it non-NULL. As currently written, the caller must + # call qapi_free_FOO() to avoid a memory leak of the partial FOO. ret += mcgen(''' void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error **errp) @@ -272,61 +238,71 @@ void visit_type_%(c_name)s(Visitor *v, %(c_name)s **obj, const char *name, Error ''', c_name=c_name(name), name=name) - if not base.is_empty(): + if not base.is_empty() or members: + if members: + type_name = c_name(name) + cast = '' + else: + type_name = base.c_name() + cast = '(%s **)' % type_name ret += mcgen(''' - visit_type_%(c_name)s_fields(v, (%(c_name)s **)obj, &err); + visit_type_%(c_name)s_fields(v, %(cast)sobj, &err); ''', - c_name=base.c_name()) - else: + c_name=type_name, cast=cast) + if variants: + ret += gen_err_check(label='out_obj') + + if variants: ret += mcgen(''' - visit_type_%(c_type)s(v, &(*obj)->%(c_name)s, "%(name)s", &err); -''', - c_type=variants.tag_member.type.c_name(), - c_name=c_name(variants.tag_member.name), - name=variants.tag_member.name) - ret += gen_err_check(label='out_obj') - ret += mcgen(''' if (!visit_start_union(v, !!(*obj)->u.data, &err) || err) { goto out_obj; } switch ((*obj)->%(c_name)s) { ''', - c_name=c_name(variants.tag_member.name)) + c_name=c_name(variants.tag_member.name)) - for var in variants.variants: - # TODO ugly special case for simple union - simple_union_type = var.simple_union_type() - ret += mcgen(''' + for var in variants.variants: + # TODO ugly special case for simple union + simple_union_type = var.simple_union_type() + ret += mcgen(''' case %(case)s: ''', - case=c_enum_const(variants.tag_member.type.name, - var.name)) - if simple_union_type: - ret += mcgen(''' + case=c_enum_const(variants.tag_member.type.name, + var.name)) + if simple_union_type: + ret += mcgen(''' visit_type_%(c_type)s(v, &(*obj)->u.%(c_name)s, "data", &err); ''', - c_type=simple_union_type.c_name(), - c_name=c_name(var.name)) - elif not var.type.is_empty(): - ret += mcgen(''' + c_type=simple_union_type.c_name(), + c_name=c_name(var.name)) + elif not var.type.is_empty(): + ret += mcgen(''' visit_type_implicit_%(c_type)s(v, &(*obj)->u.%(c_name)s, &err); ''', - c_type=var.type.c_name(), - c_name=c_name(var.name)) - ret += mcgen(''' + c_type=var.type.c_name(), + c_name=c_name(var.name)) + ret += mcgen(''' break; ''') - ret += mcgen(''' + ret += mcgen(''' default: abort(); } +''') + + ret += mcgen(''' out_obj: +''') + if variants: + ret += mcgen(''' error_propagate(errp, err); err = NULL; if (*obj) { visit_end_union(v, !!(*obj)->u.data, &err); } +''') + ret += mcgen(''' error_propagate(errp, err); err = NULL; visit_end_struct(v, &err); @@ -387,14 +363,7 @@ class QAPISchemaGenVisitVisitor(QAPISchemaVisitor): def visit_object_type(self, name, info, base, members, variants): self.decl += gen_visit_decl(name) - if variants: - if members: - # Members other than variants.tag_member not implemented - assert len(members) == 1 - assert members[0] == variants.tag_member - self.defn += gen_visit_union(name, base, variants) - else: - self.defn += gen_visit_struct(name, base, members) + self.defn += gen_visit_object(name, base, members, variants) def visit_alternate_type(self, name, info, variants): self.decl += gen_visit_decl(name)