 3b098d5697
			
		
	
	
		3b098d5697
		
	
	
	
	
		
			
			Making each output visitor provide its own output collection
function was the only remaining reason for exposing visitor
sub-types to the rest of the code base.  Add a polymorphic
visit_complete() function which is a no-op for input visitors,
and which populates an opaque pointer for output visitors.  For
maximum type-safety, also add a parameter to the output visitor
constructors with a type-correct version of the output pointer,
and assert that the two uses match.
This approach was considered superior to either passing the
output parameter only during construction (action at a distance
during visit_free() feels awkward) or only during visit_complete()
(defeating type safety makes it easier to use incorrectly).
Most callers were function-local, and therefore a mechanical
conversion; the testsuite was a bit trickier, but the previous
cleanup patch minimized the churn here.
The visit_complete() function may be called at most once; doing
so lets us use transfer semantics rather than duplication or
ref-count semantics to get the just-built output back to the
caller, even though it means our behavior is not idempotent.
Generated code is simplified as follows for events:
|@@ -26,7 +26,7 @@ void qapi_event_send_acpi_device_ost(ACP
|     QDict *qmp;
|     Error *err = NULL;
|     QMPEventFuncEmit emit;
|-    QmpOutputVisitor *qov;
|+    QObject *obj;
|     Visitor *v;
|     q_obj_ACPI_DEVICE_OST_arg param = {
|         info
|@@ -39,8 +39,7 @@ void qapi_event_send_acpi_device_ost(ACP
|
|     qmp = qmp_event_build_dict("ACPI_DEVICE_OST");
|
|-    qov = qmp_output_visitor_new();
|-    v = qmp_output_get_visitor(qov);
|+    v = qmp_output_visitor_new(&obj);
|
|     visit_start_struct(v, "ACPI_DEVICE_OST", NULL, 0, &err);
|     if (err) {
|@@ -55,7 +54,8 @@ void qapi_event_send_acpi_device_ost(ACP
|         goto out;
|     }
|
|-    qdict_put_obj(qmp, "data", qmp_output_get_qobject(qov));
|+    visit_complete(v, &obj);
|+    qdict_put_obj(qmp, "data", obj);
|     emit(QAPI_EVENT_ACPI_DEVICE_OST, qmp, &err);
and for commands:
| {
|     Error *err = NULL;
|-    QmpOutputVisitor *qov = qmp_output_visitor_new();
|     Visitor *v;
|
|-    v = qmp_output_get_visitor(qov);
|+    v = qmp_output_visitor_new(ret_out);
|     visit_type_AddfdInfo(v, "unused", &ret_in, &err);
|-    if (err) {
|-        goto out;
|+    if (!err) {
|+        visit_complete(v, ret_out);
|     }
|-    *ret_out = qmp_output_get_qobject(qov);
|-
|-out:
|     error_propagate(errp, err);
Signed-off-by: Eric Blake <eblake@redhat.com>
Message-Id: <1465490926-28625-13-git-send-email-eblake@redhat.com>
Reviewed-by: Markus Armbruster <armbru@redhat.com>
Signed-off-by: Markus Armbruster <armbru@redhat.com>
		
	
			
		
			
				
	
	
		
			217 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
			
		
		
	
	
			217 lines
		
	
	
		
			5.0 KiB
		
	
	
	
		
			Python
		
	
	
	
	
	
| #
 | |
| # QAPI event generator
 | |
| #
 | |
| # Copyright (c) 2014 Wenchao Xia
 | |
| # Copyright (c) 2015-2016 Red Hat Inc.
 | |
| #
 | |
| # Authors:
 | |
| #  Wenchao Xia <wenchaoqemu@gmail.com>
 | |
| #  Markus Armbruster <armbru@redhat.com>
 | |
| #
 | |
| # This work is licensed under the terms of the GNU GPL, version 2.
 | |
| # See the COPYING file in the top-level directory.
 | |
| 
 | |
| from qapi import *
 | |
| 
 | |
| 
 | |
| def gen_event_send_proto(name, arg_type):
 | |
|     return 'void qapi_event_send_%(c_name)s(%(param)s)' % {
 | |
|         'c_name': c_name(name.lower()),
 | |
|         'param': gen_params(arg_type, 'Error **errp')}
 | |
| 
 | |
| 
 | |
| def gen_event_send_decl(name, arg_type):
 | |
|     return mcgen('''
 | |
| 
 | |
| %(proto)s;
 | |
| ''',
 | |
|                  proto=gen_event_send_proto(name, arg_type))
 | |
| 
 | |
| 
 | |
| # Declare and initialize an object 'qapi' using parameters from gen_params()
 | |
| def gen_param_var(typ):
 | |
|     assert not typ.variants
 | |
|     ret = mcgen('''
 | |
|     %(c_name)s param = {
 | |
| ''',
 | |
|                 c_name=typ.c_name())
 | |
|     sep = '        '
 | |
|     for memb in typ.members:
 | |
|         ret += sep
 | |
|         sep = ', '
 | |
|         if memb.optional:
 | |
|             ret += 'has_' + c_name(memb.name) + sep
 | |
|         if memb.type.name == 'str':
 | |
|             # Cast away const added in gen_params()
 | |
|             ret += '(char *)'
 | |
|         ret += c_name(memb.name)
 | |
|     ret += mcgen('''
 | |
| 
 | |
|     };
 | |
| ''')
 | |
|     return ret
 | |
| 
 | |
| 
 | |
| def gen_event_send(name, arg_type):
 | |
|     # FIXME: Our declaration of local variables (and of 'errp' in the
 | |
|     # parameter list) can collide with exploded members of the event's
 | |
|     # data type passed in as parameters.  If this collision ever hits in
 | |
|     # practice, we can rename our local variables with a leading _ prefix,
 | |
|     # or split the code into a wrapper function that creates a boxed
 | |
|     # 'param' object then calls another to do the real work.
 | |
|     ret = mcgen('''
 | |
| 
 | |
| %(proto)s
 | |
| {
 | |
|     QDict *qmp;
 | |
|     Error *err = NULL;
 | |
|     QMPEventFuncEmit emit;
 | |
| ''',
 | |
|                 proto=gen_event_send_proto(name, arg_type))
 | |
| 
 | |
|     if arg_type and arg_type.members:
 | |
|         ret += mcgen('''
 | |
|     QObject *obj;
 | |
|     Visitor *v;
 | |
| ''')
 | |
|         ret += gen_param_var(arg_type)
 | |
| 
 | |
|     ret += mcgen('''
 | |
| 
 | |
|     emit = qmp_event_get_func_emit();
 | |
|     if (!emit) {
 | |
|         return;
 | |
|     }
 | |
| 
 | |
|     qmp = qmp_event_build_dict("%(name)s");
 | |
| 
 | |
| ''',
 | |
|                  name=name)
 | |
| 
 | |
|     if arg_type and arg_type.members:
 | |
|         ret += mcgen('''
 | |
|     v = qmp_output_visitor_new(&obj);
 | |
| 
 | |
|     visit_start_struct(v, "%(name)s", NULL, 0, &err);
 | |
|     if (err) {
 | |
|         goto out;
 | |
|     }
 | |
|     visit_type_%(c_name)s_members(v, ¶m, &err);
 | |
|     if (!err) {
 | |
|         visit_check_struct(v, &err);
 | |
|     }
 | |
|     visit_end_struct(v, NULL);
 | |
|     if (err) {
 | |
|         goto out;
 | |
|     }
 | |
| 
 | |
|     visit_complete(v, &obj);
 | |
|     qdict_put_obj(qmp, "data", obj);
 | |
| ''',
 | |
|                      name=name, c_name=arg_type.c_name())
 | |
| 
 | |
|     ret += mcgen('''
 | |
|     emit(%(c_enum)s, qmp, &err);
 | |
| 
 | |
| ''',
 | |
|                  c_enum=c_enum_const(event_enum_name, name))
 | |
| 
 | |
|     if arg_type and arg_type.members:
 | |
|         ret += mcgen('''
 | |
| out:
 | |
|     visit_free(v);
 | |
| ''')
 | |
|     ret += mcgen('''
 | |
|     error_propagate(errp, err);
 | |
|     QDECREF(qmp);
 | |
| }
 | |
| ''')
 | |
|     return ret
 | |
| 
 | |
| 
 | |
| class QAPISchemaGenEventVisitor(QAPISchemaVisitor):
 | |
|     def __init__(self):
 | |
|         self.decl = None
 | |
|         self.defn = None
 | |
|         self._event_names = None
 | |
| 
 | |
|     def visit_begin(self, schema):
 | |
|         self.decl = ''
 | |
|         self.defn = ''
 | |
|         self._event_names = []
 | |
| 
 | |
|     def visit_end(self):
 | |
|         self.decl += gen_enum(event_enum_name, self._event_names)
 | |
|         self.defn += gen_enum_lookup(event_enum_name, self._event_names)
 | |
|         self._event_names = None
 | |
| 
 | |
|     def visit_event(self, name, info, arg_type):
 | |
|         self.decl += gen_event_send_decl(name, arg_type)
 | |
|         self.defn += gen_event_send(name, arg_type)
 | |
|         self._event_names.append(name)
 | |
| 
 | |
| 
 | |
| (input_file, output_dir, do_c, do_h, prefix, dummy) = parse_command_line()
 | |
| 
 | |
| c_comment = '''
 | |
| /*
 | |
|  * schema-defined QAPI event functions
 | |
|  *
 | |
|  * Copyright (c) 2014 Wenchao Xia
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Wenchao Xia   <wenchaoqemu@gmail.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
 | |
|  * See the COPYING.LIB file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| '''
 | |
| h_comment = '''
 | |
| /*
 | |
|  * schema-defined QAPI event functions
 | |
|  *
 | |
|  * Copyright (c) 2014 Wenchao Xia
 | |
|  *
 | |
|  * Authors:
 | |
|  *  Wenchao Xia  <wenchaoqemu@gmail.com>
 | |
|  *
 | |
|  * This work is licensed under the terms of the GNU LGPL, version 2.1 or later.
 | |
|  * See the COPYING.LIB file in the top-level directory.
 | |
|  *
 | |
|  */
 | |
| '''
 | |
| 
 | |
| (fdef, fdecl) = open_output(output_dir, do_c, do_h, prefix,
 | |
|                             'qapi-event.c', 'qapi-event.h',
 | |
|                             c_comment, h_comment)
 | |
| 
 | |
| fdef.write(mcgen('''
 | |
| #include "qemu/osdep.h"
 | |
| #include "qemu-common.h"
 | |
| #include "%(prefix)sqapi-event.h"
 | |
| #include "%(prefix)sqapi-visit.h"
 | |
| #include "qapi/qmp-output-visitor.h"
 | |
| #include "qapi/qmp-event.h"
 | |
| 
 | |
| ''',
 | |
|                  prefix=prefix))
 | |
| 
 | |
| fdecl.write(mcgen('''
 | |
| #include "qapi/error.h"
 | |
| #include "qapi/qmp/qdict.h"
 | |
| #include "%(prefix)sqapi-types.h"
 | |
| 
 | |
| ''',
 | |
|                   prefix=prefix))
 | |
| 
 | |
| event_enum_name = c_name(prefix + "QAPIEvent", protect=False)
 | |
| 
 | |
| schema = QAPISchema(input_file)
 | |
| gen = QAPISchemaGenEventVisitor()
 | |
| schema.visit(gen)
 | |
| fdef.write(gen.defn)
 | |
| fdecl.write(gen.decl)
 | |
| 
 | |
| close_output(fdef, fdecl)
 |