From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 48779C54E60 for ; Thu, 14 Mar 2024 14:21:39 +0000 (UTC) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rklwj-000551-MX; Thu, 14 Mar 2024 10:20:37 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rklwi-00054l-Ot for qemu-devel@nongnu.org; Thu, 14 Mar 2024 10:20:36 -0400 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rklwd-0008M4-5u for qemu-devel@nongnu.org; Thu, 14 Mar 2024 10:20:36 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1710426029; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: in-reply-to:in-reply-to:references:references; bh=wIvrs85Z71jl3BURTZ6lE1WwPDHmzy3Mt1SnWKMYNtw=; b=g53j4CgXg64qM8VA1UhsQSmT5/GOabvxBiqKwGxRyU1gfy00nwL1gRwyBS9QvjK0tbuM+P uijtzuqagWWh3joRqffbhKv4k+yQeP8t+46akleHWCproOFooSqus+Et9hVtv1lZvzvSHj Y2cEaQovnAwDLdkUO0h+54uEw9x0KCk= Received: from mail-pj1-f69.google.com (mail-pj1-f69.google.com [209.85.216.69]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-39--fluZueSOeO31fionTa-7A-1; Thu, 14 Mar 2024 10:20:21 -0400 X-MC-Unique: -fluZueSOeO31fionTa-7A-1 Received: by mail-pj1-f69.google.com with SMTP id 98e67ed59e1d1-29c0315df00so883666a91.1 for ; Thu, 14 Mar 2024 07:20:19 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1710426019; x=1711030819; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=wIvrs85Z71jl3BURTZ6lE1WwPDHmzy3Mt1SnWKMYNtw=; b=nu+dhYRc0izpZEGAuVA1aDtROBONAapZOYa0KVBRzfxgKPFhzKiMMR5VBkx4AM7BNr RJQeJEHDkF5ha0NPZ7eu0OWQZhlsrlL883E5poV8aImZ/gJKXtR+Mc0OkMQkZfu7ErnM 7BDP0a7xfvVyzUZTLSYikFbEha75oROO7bQGNCSz0Im4uUYBS5qq151AyexDHXfyjEkY OxMVzfP+4Bo7JyLKj2IoTfO6uZTMb4g6Y6QwXEUi4+kiFxm/wQhPtgrmVFhuw0VVA45M RTlgiyRt0womWhDL/u5Vq7o1I3JpJ2mic0r2snJg9BCKRtrtdNUKcvbLe3fzatTdqZEX +s3A== X-Gm-Message-State: AOJu0YyiPwGEsH8M0HGSqPI8GfXKf9MQdS92IJMbpB6+QbQpkvbJwW1p /TbG0pzWn9Q4t/ptYt2G8a5CJn+1YyD12KI5jUzt/VhUVzdH8akkFE5X0Q0R90znh718Hy2DsdZ DrDFkCjgGT0Vu2afXeWHL5AmwWHRn7G0uNqaXbjYaM3uEsFseO20g0sOVqJS4wnCHnIOpE14suV tPbyqXfR1pSMdo5X3SzXbkOv5Icmo= X-Received: by 2002:a17:90b:2e8e:b0:29d:32c5:f0e9 with SMTP id sn14-20020a17090b2e8e00b0029d32c5f0e9mr130509pjb.2.1710426018842; Thu, 14 Mar 2024 07:20:18 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFc5iBQgME0olJIitYe5fxzvrz84OxoEZl/7wVEqbsswqktlp/wMHadbSQRYWlVjdoNLhpJ/zT90t+rCcyYHbc= X-Received: by 2002:a17:90b:2e8e:b0:29d:32c5:f0e9 with SMTP id sn14-20020a17090b2e8e00b0029d32c5f0e9mr130490pjb.2.1710426018470; Thu, 14 Mar 2024 07:20:18 -0700 (PDT) MIME-Version: 1.0 References: <20240313044127.49089-1-jsnow@redhat.com> <20240313044127.49089-6-jsnow@redhat.com> <87o7bh9nyt.fsf@pond.sub.org> <87il1o9afc.fsf@pond.sub.org> In-Reply-To: <87il1o9afc.fsf@pond.sub.org> From: John Snow Date: Thu, 14 Mar 2024 10:20:07 -0400 Message-ID: Subject: Re: [PATCH v4 05/23] qapi: create QAPISchemaDefinition To: Markus Armbruster Cc: qemu-devel , Peter Maydell , Michael Roth Content-Type: multipart/alternative; boundary="0000000000003ef63606139f975f" Received-SPF: pass client-ip=170.10.129.124; envelope-from=jsnow@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -30 X-Spam_score: -3.1 X-Spam_bar: --- X-Spam_report: (-3.1 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.987, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, HTML_MESSAGE=0.001, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, T_SCC_BODY_TEXT_LINE=-0.01, T_SPF_TEMPERROR=0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org --0000000000003ef63606139f975f Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Thu, Mar 14, 2024, 10:04=E2=80=AFAM Markus Armbruster wrote: > John Snow writes: > > > On Thu, Mar 14, 2024, 5:12=E2=80=AFAM Markus Armbruster > wrote: > > > >> John Snow writes: > >> > >> > Include entities don't have names, but we generally expect "entities= " > to > >> > have names. Reclassify all entities with names as *definitions*, > leaving > >> > the nameless include entities as QAPISchemaEntity instances. > >> > > >> > This is primarily to help simplify typing around expectations of wha= t > >> > callers expect for properties of an "entity". > >> > > >> > Suggested-by: Markus Armbruster > >> > Signed-off-by: John Snow > >> > --- > >> > scripts/qapi/schema.py | 144 > +++++++++++++++++++++++------------------ > >> > 1 file changed, 82 insertions(+), 62 deletions(-) > >> > > >> > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py > >> > index 117f0f78f0c..da273c1649d 100644 > >> > --- a/scripts/qapi/schema.py > >> > +++ b/scripts/qapi/schema.py > >> > >> [...] > >> > >> > @@ -107,6 +90,46 @@ def _set_module(self, schema, info): > >> > def set_module(self, schema): > >> > self._set_module(schema, self.info) > >> > > >> > + def visit(self, visitor): > >> > + # pylint: disable=3Dunused-argument > >> > + assert self._checked > >> > + > >> > + > >> > +class QAPISchemaDefinition(QAPISchemaEntity): > >> > + meta: Optional[str] =3D None > >> > + > >> > + def __init__(self, name: str, info, doc, ifcond=3DNone, > features=3DNone): > >> > + assert isinstance(name, str) > >> > + super().__init__(info) > >> > + for f in features or []: > >> > + assert isinstance(f, QAPISchemaFeature) > >> > + f.set_defined_in(name) > >> > + self.name =3D name > >> > + self.doc =3D doc > >> > + self._ifcond =3D ifcond or QAPISchemaIfCond() > >> > + self.features =3D features or [] > >> > + > >> > + def __repr__(self): > >> > + return "<%s:%s at 0x%x>" % (type(self).__name__, self.name, > >> > + id(self)) > >> > + > >> > + def c_name(self): > >> > + return c_name(self.name) > >> > + > >> > + def check(self, schema): > >> > + assert not self._checked > >> > + seen =3D {} > >> > + for f in self.features: > >> > + f.check_clash(self.info, seen) > >> > + super().check(schema) > >> > >> v3 called super().check() first. Why did you move it? I'm asking jus= t > >> to make sure I'm not missing something subtle. > >> > > > > I don't believe you are, I think it was just ... something I didn't > notice > > when rebasing, since I merged this patch by hand. I recall having to > insert > > the super call manually, and I guess my preferences are nondeterministi= c. > > I'd like to move it back, for consistency with its subtypes' .check(), > which all call super().check() early. Okay? > Yes, please do. (You *really* don't have to ask, but I understand you are being courteous to a fault. It's your module, though! I argue a lot but it *is* yours. Run it through the armbru delinter as much as you'd like.) > >> > + > >> > + def connect_doc(self, doc=3DNone): > >> > + super().connect_doc(doc) > >> > + doc =3D doc or self.doc > >> > + if doc: > >> > + for f in self.features: > >> > + doc.connect_feature(f) > >> > + > >> > @property > >> > def ifcond(self): > >> > assert self._checked > >> > >> [...] > >> > >> > > --0000000000003ef63606139f975f Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable


On Thu, Mar 14, 2024, 10:04=E2=80=AFAM Markus Armbrust= er <armbru@redhat.com> wrote= :
John Snow <jsnow@redhat.com&= gt; writes:

> On Thu, Mar 14, 2024, 5:12=E2=80=AFAM Markus Armbruster <armbru@redh= at.com> wrote:
>
>> John Snow <jsnow@redhat.com> writes:
>>
>> > Include entities don't have names, but we generally expec= t "entities" to
>> > have names. Reclassify all entities with names as *definition= s*, leaving
>> > the nameless include entities as QAPISchemaEntity instances.<= br> >> >
>> > This is primarily to help simplify typing around expectations= of what
>> > callers expect for properties of an "entity".
>> >
>> > Suggested-by: Markus Armbruster <armbru@redhat.com><= br> >> > Signed-off-by: John Snow <jsnow@redhat.com>
>> > ---
>> >=C2=A0 scripts/qapi/schema.py | 144 +++++++++++++++++++++++---= ---------------
>> >=C2=A0 1 file changed, 82 insertions(+), 62 deletions(-)
>> >
>> > diff --git a/scripts/qapi/schema.py b/scripts/qapi/schema.py<= br> >> > index 117f0f78f0c..da273c1649d 100644
>> > --- a/scripts/qapi/schema.py
>> > +++ b/scripts/qapi/schema.py
>>
>> [...]
>>
>> > @@ -107,6 +90,46 @@ def _set_module(self, schema, info):
>> >=C2=A0 =C2=A0 =C2=A0 def set_module(self, schema):
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 self._set_module(schema, = self.info)
>> >
>> > +=C2=A0 =C2=A0 def visit(self, visitor):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 # pylint: disable=3Dunused-argum= ent
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 assert self._checked
>> > +
>> > +
>> > +class QAPISchemaDefinition(QAPISchemaEntity):
>> > +=C2=A0 =C2=A0 meta: Optional[str] =3D None
>> > +
>> > +=C2=A0 =C2=A0 def __init__(self, name: str, info, doc, ifcon= d=3DNone, features=3DNone):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 assert isinstance(name, str)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 super().__init__(info)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 for f in features or []:
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 assert isinstance(= f, QAPISchemaFeature)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 f.set_defined_in(n= ame)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 self.name =3D name
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 self.doc =3D doc
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 self._ifcond =3D ifcond or QAPIS= chemaIfCond()
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 self.features =3D features or []=
>> > +
>> > +=C2=A0 =C2=A0 def __repr__(self):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return "<%s:%s at 0x%x&g= t;" % (type(self).__name__, self.name,
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 id(self)= )
>> > +
>> > +=C2=A0 =C2=A0 def c_name(self):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 return c_name(self.name) >> > +
>> > +=C2=A0 =C2=A0 def check(self, schema):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 assert not self._checked
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 seen =3D {}
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 for f in self.features:
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 f.check_clash(se= lf.info, seen)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 super().check(schema)
>>
>> v3 called super().check() first.=C2=A0 Why did you move it?=C2=A0 = I'm asking just
>> to make sure I'm not missing something subtle.
>>
>
> I don't believe you are, I think it was just ... something I didn&= #39;t notice
> when rebasing, since I merged this patch by hand. I recall having to i= nsert
> the super call manually, and I guess my preferences are nondeterminist= ic.

I'd like to move it back, for consistency with its subtypes' .check= (),
which all call super().check() early.=C2=A0 Okay?

Yes, please do.

(You *really* don't have to as= k, but I understand you are being courteous to a fault. It's your modul= e, though! I argue a lot but it *is* yours. Run it through the armbru delin= ter as much as you'd like.)


>> > +
>> > +=C2=A0 =C2=A0 def connect_doc(self, doc=3DNone):
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 super().connect_doc(doc)
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 doc =3D doc or self.doc
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 if doc:
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 for f in self.feat= ures:
>> > +=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 doc.= connect_feature(f)
>> > +
>> >=C2=A0 =C2=A0 =C2=A0 @property
>> >=C2=A0 =C2=A0 =C2=A0 def ifcond(self):
>> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 assert self._checked
>>
>> [...]
>>
>>

--0000000000003ef63606139f975f--