mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

qapi-commands: De-duplicate output marshaling functions

Browse Source 
gen_marshal_output() uses its parameter name only for name of the
generated function.  Name it after the type being marshaled instead of
its caller, and drop duplicates.

Saves 7 copies of qmp_marshal_output_int() in qemu-ga, and one copy of
qmp_marshal_output_str() in qemu-system-*.

Signed-off-by: Markus Armbruster <armbru@redhat.com>
Reviewed-by: Eric Blake <eblake@redhat.com>
Reviewed-by: Daniel P. Berrange <berrange@redhat.com>
Message-Id: <1442401589-24189-19-git-send-email-armbru@redhat.com>
This commit is contained in:
Markus Armbruster 2015-09-16 13:06:21 +02:00
parent 03b4367a55
commit 56d92b003a
2 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docs/qapi-code-gen.txt
View File

@ -721,7 +721,7 @@ Example:
$ cat qapi-generated/example-qmp-marshal.c $ cat qapi-generated/example-qmp-marshal.c
[Uninteresting stuff omitted...] [Uninteresting stuff omitted...]
static void qmp_marshal_output_my_command(UserDefOne *ret_in, QObject **ret_out, Error **errp) static void qmp_marshal_output_UserDefOne(UserDefOne *ret_in, QObject **ret_out, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
QmpOutputVisitor *mo = qmp_output_visitor_new(); QmpOutputVisitor *mo = qmp_output_visitor_new();
@ -764,7 +764,7 @@ Example:
goto out; goto out;
} }
qmp_marshal_output_my_command(retval, ret, &local_err); qmp_marshal_output_UserDefOne(retval, ret, &local_err);
out: out:
error_propagate(errp, local_err); error_propagate(errp, local_err);

17
scripts/qapi-commands.py
View File

@ -62,7 +62,7 @@ def gen_call(name, arg_type, ret_type):
qmp_marshal_output_%(c_name)s(retval, ret, &local_err); qmp_marshal_output_%(c_name)s(retval, ret, &local_err);
''', ''',
c_name=c_name(name)) c_name=ret_type.c_name())
pop_indent() pop_indent()
return ret return ret
@ -166,10 +166,10 @@ qapi_dealloc_visitor_cleanup(md);
return ret return ret
def gen_marshal_output(name, ret_type): def gen_marshal_output(ret_type):
return mcgen(''' return mcgen('''
static void qmp_marshal_output_%(c_cmd_name)s(%(c_type)s ret_in, QObject **ret_out, Error **errp) static void qmp_marshal_output_%(c_name)s(%(c_type)s ret_in, QObject **ret_out, Error **errp)
{ {
Error *local_err = NULL; Error *local_err = NULL;
QmpOutputVisitor *mo = qmp_output_visitor_new(); QmpOutputVisitor *mo = qmp_output_visitor_new();
@ -192,8 +192,7 @@ out:
qapi_dealloc_visitor_cleanup(md); qapi_dealloc_visitor_cleanup(md);
} }
''', ''',
c_type=ret_type.c_type(), c_cmd_name=c_name(name), c_type=ret_type.c_type(), c_name=ret_type.c_name())
c_name=ret_type.c_name())
def gen_marshal_proto(name): def gen_marshal_proto(name):
@ -272,24 +271,28 @@ class QAPISchemaGenCommandVisitor(QAPISchemaVisitor):
self.decl = None self.decl = None
self.defn = None self.defn = None
self._regy = None self._regy = None
self._visited_ret_types = None
def visit_begin(self, schema): def visit_begin(self, schema):
self.decl = '' self.decl = ''
self.defn = '' self.defn = ''
self._regy = '' self._regy = ''
self._visited_ret_types = set()
def visit_end(self): def visit_end(self):
if not middle_mode: if not middle_mode:
self.defn += gen_registry(self._regy) self.defn += gen_registry(self._regy)
self._regy = None self._regy = None
self._visited_ret_types = None
def visit_command(self, name, info, arg_type, ret_type, def visit_command(self, name, info, arg_type, ret_type,
gen, success_response): gen, success_response):
if not gen: if not gen:
return return
self.decl += gen_command_decl(name, arg_type, ret_type) self.decl += gen_command_decl(name, arg_type, ret_type)
if ret_type: if ret_type and ret_type not in self._visited_ret_types:
self.defn += gen_marshal_output(name, ret_type) self._visited_ret_types.add(ret_type)
self.defn += gen_marshal_output(ret_type)
if middle_mode: if middle_mode:
self.decl += gen_marshal_decl(name) self.decl += gen_marshal_decl(name)
self.defn += gen_marshal(name, arg_type, ret_type) self.defn += gen_marshal(name, arg_type, ret_type)