| Message ID | 1527612092-65980-2-git-send-email-anton.nefedov@virtuozzo.com |
|---|---|
| State | New |
| Headers | show |
| Series | qapi: allow empty branches in flat unions | expand |
On 05/29/2018 11:41 AM, Anton Nefedov wrote: > It often happens that just a few discriminator values imply extra data in > a flat union. Existing checks did not make possible to leave other values > uncovered. Such cases had to be worked around by either stating a dummy > (empty) type or introducing another (subset) discriminator enumeration. > > Both options create redundant entities in qapi files for little profit. > > With this patch it is not necessary anymore to add designated union > fields for every possible value of a discriminator enumeration. > > Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com> > --- > docs/devel/qapi-code-gen.txt | 7 ++++--- > scripts/qapi/common.py | 11 ++++------- > scripts/qapi/types.py | 4 +++- > scripts/qapi/visit.py | 17 +++++++++++++---- > tests/qapi-schema/flat-union-incomplete-branch.err | 1 - > tests/qapi-schema/flat-union-incomplete-branch.exit | 2 +- > tests/qapi-schema/flat-union-incomplete-branch.out | 14 ++++++++++++++ Generally, when converting a negative test to a positive test, I prefer to instead drop the negative test and put the positive test as part of tests/qapi-schema/qapi-schema-test.json - because that file has the additional coverage of proving that the compiler is still happy with the generated code (we don't compile any of the other positive tests). > 7 files changed, 39 insertions(+), 17 deletions(-) > > diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt > index b9b6eab..a3ea450 100644 > --- a/docs/devel/qapi-code-gen.txt > +++ b/docs/devel/qapi-code-gen.txt > @@ -496,9 +496,10 @@ Resulting in these JSON objects: > > Notice that in a flat union, the discriminator name is controlled by > the user, but because it must map to a base member with enum type, the > -code generator can ensure that branches exist for all values of the > -enum (although the order of the keys need not match the declaration of > -the enum). In the resulting generated C data types, a flat union is > +code generator ensures that branches match the existing values of the > +enum. The order of the keys need not match the declaration of the enum. > +The keys need not cover all possible enum values. Maybe mention that omitted enum values are still valid branches that merely add no additional members to the data type. > +In the resulting generated C data types, a flat union is > represented as a struct with the base members included directly, and > then a union of structures for each branch of the struct. > Otherwise seems reasonable to me.
diff --git a/docs/devel/qapi-code-gen.txt b/docs/devel/qapi-code-gen.txt index b9b6eab..a3ea450 100644 --- a/docs/devel/qapi-code-gen.txt +++ b/docs/devel/qapi-code-gen.txt @@ -496,9 +496,10 @@ Resulting in these JSON objects: Notice that in a flat union, the discriminator name is controlled by the user, but because it must map to a base member with enum type, the -code generator can ensure that branches exist for all values of the -enum (although the order of the keys need not match the declaration of -the enum). In the resulting generated C data types, a flat union is +code generator ensures that branches match the existing values of the +enum. The order of the keys need not match the declaration of the enum. +The keys need not cover all possible enum values. +In the resulting generated C data types, a flat union is represented as a struct with the base members included directly, and then a union of structures for each branch of the struct. diff --git a/scripts/qapi/common.py b/scripts/qapi/common.py index a032cec..df6190a 100644 --- a/scripts/qapi/common.py +++ b/scripts/qapi/common.py @@ -782,13 +782,6 @@ def check_union(expr, info): "enum '%s'" % (key, enum_define['enum'])) - # If discriminator is user-defined, ensure all values are covered - if enum_define: - for value in enum_define['data']: - if value not in members.keys(): - raise QAPISemError(info, "Union '%s' data missing '%s' branch" - % (name, value)) - def check_alternate(expr, info): name = expr['alternate'] @@ -1644,6 +1637,10 @@ class QAPISchema(object): if tag_name: variants = [self._make_variant(key, value) for (key, value) in data.items()] + # branches that are not explicitly covered get an empty type + variants += [self._make_variant(key, 'q_empty') + for key in discriminator_find_enum_define(expr)['data'] + if key not in data.keys()] members = [] else: variants = [self._make_simple_variant(key, value, info) diff --git a/scripts/qapi/types.py b/scripts/qapi/types.py index 64d9c0f..1fb2b6d 100644 --- a/scripts/qapi/types.py +++ b/scripts/qapi/types.py @@ -124,7 +124,9 @@ def gen_variants(variants): ''', c_name=c_name(variants.tag_member.name)) - for var in variants.variants: + # filter out the empty types + for var in filter(lambda var: var.type.name != 'q_empty', + variants.variants): ret += mcgen(''' %(c_type)s %(c_name)s; ''', diff --git a/scripts/qapi/visit.py b/scripts/qapi/visit.py index 5d72d89..96bd32c 100644 --- a/scripts/qapi/visit.py +++ b/scripts/qapi/visit.py @@ -81,14 +81,23 @@ void visit_type_%(c_name)s_members(Visitor *v, %(c_name)s *obj, Error **errp) c_name=c_name(variants.tag_member.name)) for var in variants.variants: - ret += mcgen(''' + case_str = c_enum_const(variants.tag_member.type.name, + var.name, + variants.tag_member.type.prefix) + if var.type.name == 'q_empty': + # valid variant and nothing to do + ret += mcgen(''' + case %(case)s: + break; +''', + case=case_str) + else: + ret += mcgen(''' case %(case)s: visit_type_%(c_type)s_members(v, &obj->u.%(c_name)s, &err); break; ''', - case=c_enum_const(variants.tag_member.type.name, - var.name, - variants.tag_member.type.prefix), + case=case_str, c_type=var.type.c_name(), c_name=c_name(var.name)) ret += mcgen(''' diff --git a/tests/qapi-schema/flat-union-incomplete-branch.err b/tests/qapi-schema/flat-union-incomplete-branch.err index e826bf0..e69de29 100644 --- a/tests/qapi-schema/flat-union-incomplete-branch.err +++ b/tests/qapi-schema/flat-union-incomplete-branch.err @@ -1 +0,0 @@ -tests/qapi-schema/flat-union-incomplete-branch.json:6: Union 'TestUnion' data missing 'value2' branch diff --git a/tests/qapi-schema/flat-union-incomplete-branch.exit b/tests/qapi-schema/flat-union-incomplete-branch.exit index d00491f..573541a 100644 --- a/tests/qapi-schema/flat-union-incomplete-branch.exit +++ b/tests/qapi-schema/flat-union-incomplete-branch.exit @@ -1 +1 @@ -1 +0 diff --git a/tests/qapi-schema/flat-union-incomplete-branch.out b/tests/qapi-schema/flat-union-incomplete-branch.out index e69de29..4e774bc 100644 --- a/tests/qapi-schema/flat-union-incomplete-branch.out +++ b/tests/qapi-schema/flat-union-incomplete-branch.out @@ -0,0 +1,14 @@ +object q_empty +enum QType ['none', 'qnull', 'qnum', 'qstring', 'qdict', 'qlist', 'qbool'] + prefix QTYPE +module flat-union-incomplete-branch.json +enum TestEnum ['value1', 'value2'] +object TestTypeA + member string: str optional=False +object q_obj_TestUnion-base + member type: TestEnum optional=False +object TestUnion + base q_obj_TestUnion-base + tag type + case value1: TestTypeA + case value2: q_empty
It often happens that just a few discriminator values imply extra data in a flat union. Existing checks did not make possible to leave other values uncovered. Such cases had to be worked around by either stating a dummy (empty) type or introducing another (subset) discriminator enumeration. Both options create redundant entities in qapi files for little profit. With this patch it is not necessary anymore to add designated union fields for every possible value of a discriminator enumeration. Signed-off-by: Anton Nefedov <anton.nefedov@virtuozzo.com> --- docs/devel/qapi-code-gen.txt | 7 ++++--- scripts/qapi/common.py | 11 ++++------- scripts/qapi/types.py | 4 +++- scripts/qapi/visit.py | 17 +++++++++++++---- tests/qapi-schema/flat-union-incomplete-branch.err | 1 - tests/qapi-schema/flat-union-incomplete-branch.exit | 2 +- tests/qapi-schema/flat-union-incomplete-branch.out | 14 ++++++++++++++ 7 files changed, 39 insertions(+), 17 deletions(-)