• Markus Armbruster's avatar
    qapi: Generate separate .h, .c for each module · 252dc310
    Markus Armbruster authored
    Our qapi-schema.json is composed of modules connected by include
    directives, but the generated code is monolithic all the same: one
    qapi-types.h with all the types, one qapi-visit.h with all the
    visitors, and so forth.  These monolithic headers get included all
    over the place.  In my "build everything" tree, adding a QAPI type
    recompiles about 4800 out of 5100 objects.
    
    We wouldn't write such monolithic headers by hand.  It stands to
    reason that we shouldn't generate them, either.
    
    Split up generated qapi-types.h to mirror the schema's modular
    structure: one header per module.  Name the main module's header
    qapi-types.h, and sub-module D/B.json's header D/qapi-types-B.h.
    
    Mirror the schema's includes in the headers, so that qapi-types.h gets
    you everything exactly as before.  If you need less, you can include
    one or more of the sub-module headers.  To be exploited shortly.
    
    Split up qapi-types.c, qapi-visit.h, qapi-visit.c, qmp-commands.h,
    qmp-commands.c, qapi-event.h, qapi-event.c the same way.
    qmp-introspect.h, qmp-introspect.c and qapi.texi remain monolithic.
    
    The split of qmp-commands.c duplicates static helper function
    qmp_marshal_output_str() in qapi-commands-char.c and
    qapi-commands-misc.c.  This happens when commands returning the same
    type occur in multiple modules.  Not worth avoiding.
    
    Since I'm going to rename qapi-event.[ch] to qapi-events.[ch], and
    qmp-commands.[ch] to qapi-commands.[ch], name the shards that way
    already, to reduce churn.  This requires temporary hacks in
    commands.py and events.py.  Similarly, c_name() must temporarily
    be taught to munge '/' in common.py.  They'll go away with the rename.
    Signed-off-by: 's avatarMarkus Armbruster <armbru@redhat.com>
    Message-Id: <20180211093607.27351-23-armbru@redhat.com>
    Reviewed-by: 's avatarEric Blake <eblake@redhat.com>
    [eblake: declare a dummy variable in each .c file, to shut up OSX
    toolchain warnings about empty .o files, including hacking c_name()]
    Signed-off-by: 's avatarEric Blake <eblake@redhat.com>
    252dc310
Makefile.objs 8.43 KB