• E
    qapi: Unbox base members · ddf21908
    Eric Blake 提交于
    Rather than storing a base class as a pointer to a box, just
    store the fields of that base class in the same order, so that
    a child struct can be directly cast to its parent.  This gives
    less malloc overhead, less pointer dereferencing, and even less
    generated code.  Compare to the earlier commit 1e6c1616 "qapi:
    Generate a nicer struct for flat unions" (although that patch
    had fewer places to change, as less of qemu was directly using
    qapi structs for flat unions).  It also allows us to turn on
    automatic type-safe wrappers for upcasting to the base class
    of a struct.
    
    Changes to the generated code look like this in qapi-types.h:
    
    | struct SpiceChannel {
    |-    SpiceBasicInfo *base;
    |+    /* Members inherited from SpiceBasicInfo: */
    |+    char *host;
    |+    char *port;
    |+    NetworkAddressFamily family;
    |+    /* Own members: */
    |     int64_t connection_id;
    
    as well as additional upcast functions like qapi_SpiceChannel_base().
    Meanwhile, changes to qapi-visit.c look like:
    
    | static void visit_type_SpiceChannel_fields(Visitor *v, SpiceChannel **obj, Error **errp)
    | {
    |     Error *err = NULL;
    |
    |-    visit_type_implicit_SpiceBasicInfo(v, &(*obj)->base, &err);
    |+    visit_type_SpiceBasicInfo_fields(v, (SpiceBasicInfo **)obj, &err);
    |     if (err) {
    
    (the cast is necessary, since our upcast wrappers only deal with a
    single pointer, not pointer-to-pointer); plus the wholesale
    elimination of some now-unused visit_type_implicit_FOO() functions.
    
    Without boxing, the corner case of one empty struct having
    another empty struct as its base type now requires inserting a
    dummy member (previously, the 'Base *base' member sufficed).
    
    And now that we no longer consume a 'base' member in the generated
    C struct, we can delete the former negative struct-base-clash-base
    test.
    Signed-off-by: NEric Blake <eblake@redhat.com>
    Message-Id: <1445898903-12082-11-git-send-email-eblake@redhat.com>
    [Commit message tweaked slightly]
    Signed-off-by: NMarkus Armbruster <armbru@redhat.com>
    ddf21908
test-qmp-output-visitor.c 29.9 KB