SYS-OSS/FRET-qemu
4
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

qapi/commands: Simplify command registry generation

Browse Source 
QAPISchemaGenCommandVisitor.visit_command() needs to generate the
marshalling function into the current module, and also generate its
registration into the ./init system module.  The latter is done
somewhat awkwardly: .__init__() creates a QAPIGenCCode that will not
be written out, each .visit_command() adds its registration to it, and
.visit_end() copies its contents into the ./init module it creates.

Instead provide the means to temporarily switch to another module.
Create the ./init module in .visit_begin(), and generate its initial
part.  Add registrations to it in .visit_command().  Finish it in
.visit_end().

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: John Snow <jsnow@redhat.com>
Message-Id: <20210201193747.2169670-14-jsnow@redhat.com>
This commit is contained in:
Markus Armbruster 2021-02-01 14:37:44 -05:00
parent d921d27c1b
commit c6cd7e4151
1 changed files with 22 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
scripts/qapi/commands.py
View File

@ -23,7 +23,6 @@ from typing import (
from .common import c_name, mcgen from .common import c_name, mcgen
from .gen import ( from .gen import (
QAPIGenC, QAPIGenC,
QAPIGenCCode,
QAPISchemaModularCVisitor, QAPISchemaModularCVisitor,
build_params, build_params,
ifcontext, ifcontext,
@ -237,28 +236,11 @@ def gen_register_command(name: str,
return ret return ret
def gen_registry(registry: str, prefix: str) -> str:
ret = mcgen('''
void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds)
{
QTAILQ_INIT(cmds);
''',
c_prefix=c_name(prefix, protect=False))
ret += registry
ret += mcgen('''
}
''')
return ret
class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor): class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
def __init__(self, prefix: str): def __init__(self, prefix: str):
super().__init__( super().__init__(
prefix, 'qapi-commands', prefix, 'qapi-commands',
' * Schema-defined QAPI/QMP commands', None, __doc__) ' * Schema-defined QAPI/QMP commands', None, __doc__)
self._regy = QAPIGenCCode(None)
self._visited_ret_types: Dict[QAPIGenC, Set[QAPISchemaType]] = {} self._visited_ret_types: Dict[QAPIGenC, Set[QAPISchemaType]] = {}
def _begin_user_module(self, name: str) -> None: def _begin_user_module(self, name: str) -> None:
@ -285,7 +267,7 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
''', ''',
types=types)) types=types))
def visit_end(self) -> None: def visit_begin(self, schema: QAPISchema) -> None:
self._add_module('./init', ' * QAPI Commands initialization') self._add_module('./init', ' * QAPI Commands initialization')
self._genh.add(mcgen(''' self._genh.add(mcgen('''
#include "qapi/qmp/dispatch.h" #include "qapi/qmp/dispatch.h"
@ -293,13 +275,24 @@ class QAPISchemaGenCommandVisitor(QAPISchemaModularCVisitor):
void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds); void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);
''', ''',
c_prefix=c_name(self._prefix, protect=False))) c_prefix=c_name(self._prefix, protect=False)))
self._genc.preamble_add(mcgen(''' self._genc.add(mcgen('''
#include "qemu/osdep.h" #include "qemu/osdep.h"
#include "%(prefix)sqapi-commands.h" #include "%(prefix)sqapi-commands.h"
#include "%(prefix)sqapi-init-commands.h" #include "%(prefix)sqapi-init-commands.h"
void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds)
{
QTAILQ_INIT(cmds);
''', ''',
prefix=self._prefix)) prefix=self._prefix,
self._genc.add(gen_registry(self._regy.get_content(), self._prefix)) c_prefix=c_name(self._prefix, protect=False)))
def visit_end(self) -> None:
with self._temp_module('./init'):
self._genc.add(mcgen('''
}
'''))
def visit_command(self, def visit_command(self,
name: str, name: str,
@ -324,15 +317,17 @@ void %(c_prefix)sqmp_init_marshal(QmpCommandList *cmds);
if ret_type and ret_type not in self._visited_ret_types[self._genc]: if ret_type and ret_type not in self._visited_ret_types[self._genc]:
self._visited_ret_types[self._genc].add(ret_type) self._visited_ret_types[self._genc].add(ret_type)
with ifcontext(ret_type.ifcond, with ifcontext(ret_type.ifcond,
self._genh, self._genc, self._regy): self._genh, self._genc):
self._genc.add(gen_marshal_output(ret_type)) self._genc.add(gen_marshal_output(ret_type))
with ifcontext(ifcond, self._genh, self._genc, self._regy): with ifcontext(ifcond, self._genh, self._genc):
self._genh.add(gen_command_decl(name, arg_type, boxed, ret_type)) self._genh.add(gen_command_decl(name, arg_type, boxed, ret_type))
self._genh.add(gen_marshal_decl(name)) self._genh.add(gen_marshal_decl(name))
self._genc.add(gen_marshal(name, arg_type, boxed, ret_type)) self._genc.add(gen_marshal(name, arg_type, boxed, ret_type))
self._regy.add(gen_register_command(name, success_response, with self._temp_module('./init'):
allow_oob, allow_preconfig, with ifcontext(ifcond, self._genh, self._genc):
coroutine)) self._genc.add(gen_register_command(name, success_response,
allow_oob, allow_preconfig,
coroutine))
def gen_commands(schema: QAPISchema, def gen_commands(schema: QAPISchema,