[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v1][ 10/23] qapi: add qapi-commands.py code generato
From: |
Michael Roth |
Subject: |
[Qemu-devel] [PATCH v1][ 10/23] qapi: add qapi-commands.py code generator |
Date: |
Tue, 17 May 2011 19:51:57 -0500 |
This is the code generator for qapi command marshaling/dispatch.
Currently only generators for synchronous qapi/qmp functions are
supported. This script generates the following files:
$(prefix)qmp-marshal.c: command marshal/dispatch functions for each
QMP command defined in the schema. Functions
generated by qapi-visit.py are used to
convert qobjects recieved from the wire into
function parameters, and uses the same
visiter functions to convert native C return
values to qobjects from transmission back
over the wire.
$(prefix)qmp-commands.h: Function prototypes for the QMP commands
specified in the schema.
$(prefix) is used in the same manner as with qapi-types.py
Signed-off-by: Michael Roth <address@hidden>
---
scripts/qapi-commands.py | 437 ++++++++++++++++++++++++++++++++++++++++++++++
1 files changed, 437 insertions(+), 0 deletions(-)
create mode 100644 scripts/qapi-commands.py
diff --git a/scripts/qapi-commands.py b/scripts/qapi-commands.py
new file mode 100644
index 0000000..0cbe3cb
--- /dev/null
+++ b/scripts/qapi-commands.py
@@ -0,0 +1,437 @@
+from ordereddict import OrderedDict
+from qapi import *
+import sys
+import getopt
+
+def generate_visit_struct_body(field_prefix, members):
+ ret = ""
+ if len(field_prefix):
+ field_prefix = field_prefix + "."
+ for argname, argentry, optional, structured in parse_args(members):
+ if optional:
+ ret += mcgen('''
+visit_start_optional(m, &(*obj)->%(c_prefix)shas_%(c_name)s, "%(name)s", errp);
+if ((*obj)->%(prefix)shas_%(c_name)s) {
+''',
+ c_prefix=c_var(field_prefix), prefix=field_prefix,
+ c_name=c_var(argname), name=argname)
+ push_indent()
+
+ if structured:
+ ret += mcgen('''
+visit_start_struct(m, NULL, "", "%(name)s", errp);
+''',
+ name=argname)
+ ret += generate_visit_struct_body(field_prefix + argname, argentry)
+ ret += mcgen('''
+visit_end_struct(m, errp);
+''')
+ else:
+ ret += mcgen('''
+visit_type_%(type)s(m, &(*obj)->%(c_prefix)s%(c_name)s, "%(name)s", errp);
+''',
+ c_prefix=c_var(field_prefix), prefix=field_prefix,
+ type=type_name(argentry), c_name=c_var(argname),
+ name=argname)
+
+ if optional:
+ pop_indent()
+ ret += mcgen('''
+}
+visit_end_optional(m, errp);
+''')
+ return ret
+
+def generate_visit_struct(name, members):
+ ret = mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s ** obj, const char *name, Error
**errp)
+{
+ visit_start_struct(m, (void **)obj, "%(name)s", name, errp);
+''',
+ name=name)
+ push_indent()
+ ret += generate_visit_struct_body("", members)
+ pop_indent()
+
+ ret += mcgen('''
+ visit_end_struct(m, errp);
+}
+''')
+ return ret
+
+def generate_visit_list(name, members):
+ return mcgen('''
+
+void visit_type_%(name)sList(Visiter *m, %(name)sList ** obj, const char
*name, Error **errp)
+{
+ GenericList *i;
+
+ visit_start_list(m, name, errp);
+
+ for (i = visit_next_list(m, (GenericList **)obj, errp); i; i =
visit_next_list(m, &i, errp)) {
+ %(name)sList *native_i = (%(name)sList *)i;
+ visit_type_%(name)s(m, &native_i->value, NULL, errp);
+ }
+
+ visit_end_list(m, errp);
+}
+''',
+ name=name)
+
+def generate_visit_handle(name, typeinfo):
+ return mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s ** obj, const char *name, Error
**errp)
+{
+ visit_start_handle(m, (void **)obj, "%(name)s", name, errp);
+ visit_type_%(type_name)s(m, &(*obj)->handle, "handle", errp);
+ visit_end_handle(m, errp);
+}
+''',
+ name=name, type_name=type_name(typeinfo))
+
+def generate_visit_enum(name, members):
+ return mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s * obj, const char *name, Error
**errp)
+{
+ visit_type_enum(m, (int *)obj, "%(name)s", name, errp);
+}
+''',
+ name=name)
+
+def generate_visit_union(name, members):
+ ret = generate_visit_enum('%sKind' % name, members.keys())
+
+ ret += mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s ** obj, const char *name, Error
**errp)
+{
+}
+''',
+ name=name)
+
+ return ret
+
+def generate_declaration(name, members, genlist=True):
+ ret = mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s ** obj, const char *name, Error
**errp);
+''',
+ name=name)
+
+ if genlist:
+ ret += mcgen('''
+void visit_type_%(name)sList(Visiter *m, %(name)sList ** obj, const char
*name, Error **errp);
+''',
+ name=name)
+
+ return ret
+
+def generate_decl_enum(name, members, genlist=True):
+ return mcgen('''
+
+void visit_type_%(name)s(Visiter *m, %(name)s * obj, const char *name, Error
**errp);
+''',
+ name=name)
+
+def generate_command_decl(name, args, ret_type):
+ arglist=""
+ for argname, argtype, optional, structured in parse_args(args):
+ argtype = c_type(argtype)
+ if argtype == "char *":
+ argtype = "const char *"
+ if optional:
+ arglist += "bool has_%s, " % c_var(argname)
+ arglist += "%s %s, " % (argtype, c_var(argname))
+ return mcgen('''
+%(ret_type)s qmp_%(name)s(%(args)sError **errp);
+''',
+ ret_type=c_type(ret_type), name=c_var(name),
args=arglist).strip()
+
+def gen_sync_call(name, args, has_ret):
+ arglist=""
+ retval=""
+ if has_ret:
+ retval = "retval = "
+ for argname, argtype, optional, structured in parse_args(args):
+ if optional:
+ arglist += "has_%s, " % c_var(argname)
+ arglist += "%s, " % (c_var(argname))
+ return mcgen('''
+%(retval)sqmp_%(name)s(%(args)serrp);
+''',
+ name=c_var(name), args=arglist, retval=retval).rstrip()
+
+def gen_marshal_output_call(name, ret_type):
+ if not ret_type:
+ return ""
+ return mcgen('''
+qmp_marshal_output_%(c_name)s(retval, ret, errp);
+''',
+ c_name=c_var(name))
+
+def gen_visiter_block(args):
+ ret = ""
+ push_indent()
+ for argname, argtype, optional, structured in parse_args(args):
+ if optional:
+ ret += mcgen('''
+bool has_%(argname)s = false;
+''',
+ argname=c_var(argname))
+ ret += mcgen('''
+%(argtype)s %(argname)s;
+''',
+ argname=c_var(argname), argtype=c_type(argtype))
+ ret += "\n"
+
+ for argname, argtype, optional, structured in parse_args(args):
+ if optional:
+ ret += mcgen('''
+visit_start_optional(v, &has_%(c_name)s, "%(name)s", errp);
+if (has_%(c_name)s) {
+''',
+ c_name=c_var(argname), name=argname)
+ push_indent()
+ ret += mcgen('''
+visit_type_%(argtype)s(v, &%(c_name)s, "%(name)s", errp);
+''',
+ c_name=c_var(argname), name=argname, argtype=argtype)
+ if optional:
+ pop_indent()
+ ret += mcgen('''
+}
+visit_end_optional(v, errp);
+''')
+ pop_indent()
+ return ret
+
+def gen_marshal_output(name, args, ret_type):
+ if not ret_type:
+ return ""
+ visit = ""
+ push_indent()
+ visit = mcgen('''
+QmpOutputVisiter *mo = qmp_output_visiter_new();
+Visiter *v = qmp_output_get_visiter(mo);
+
+visit_type_%(ret_type)s(v, &ret_in, "unused", errp);
+''',
+ c_ret_type=c_type(ret_type), c_name=c_var(name),
+ ret_type=ret_type)
+ pop_indent()
+ ret = mcgen('''
+static void qmp_marshal_output_%(c_name)s(%(c_ret_type)s ret_in, QObject
**ret_out, Error **errp)
+{
+%(visit)s
+ *ret_out = qmp_output_get_qobject(mo);
+}
+''',
+ c_name=c_var(name), c_ret_type=c_type(ret_type), visit=visit)
+
+ return ret
+
+def gen_marshal_input(name, args, ret_type):
+ retval = ""
+ if ret_type:
+ retval = " %s retval;" % c_type(ret_type)
+
+
+ ret = mcgen('''
+static void qmp_marshal_input_%(c_name)s(QmpState *qmp__sess, QDict *args,
QObject **ret, Error **errp)
+{
+''',
+ c_name=c_var(name))
+
+ if (len(args) > 0):
+ ret += mcgen('''
+ QmpInputVisiter *mi = qmp_input_visiter_new(QOBJECT(args));
+ Visiter *v = qmp_input_get_visiter(mi);
+''')
+
+ ret += mcgen('''
+%(retval)s
+%(visiter_block)s
+ if (!error_is_set(errp)) {
+ %(sync_call)s
+ %(marshal_response_call)s
+ }
+}
+''',
+ retval=retval,
+ visiter_block=gen_visiter_block(args),
+ sync_call=gen_sync_call(name, args, ret_type),
+ marshal_response_call=gen_marshal_output_call(name, ret_type))
+ return ret
+
+def gen_marshal_input_proxy(name, args, ret_type):
+ retval = ""
+ if (ret_type):
+ retval = " %s retval;" % c_type(ret_type)
+
+ ret = mcgen('''
+static void qmp_marshal_input_%(c_name)s(QmpCommandState *s, QDict *args,
Error **errp)
+{
+ QmpInputVisiter *mi = qmp_input_visiter_new(QOBJECT(args));
+ Visiter *v = qmp_input_get_visiter(mi);
+%(retval)s
+%(visiter_block)s
+ qmp_proxy_dispatch(%(name)s, args, errp, s);
+''',
+ c_name=c_var(name), retval=retval,
+ visiter_block=gen_visiter_block(args), name=name)
+
+ return ret
+
+def gen_registry(commands):
+ registry=""
+ push_indent()
+ for cmd in commands:
+ registry += mcgen('''
+qmp_register_command("%(name)s", qmp_marshal_input_%(c_name)s);
+''',
+ name=cmd['command'], c_name=c_var(cmd['command']))
+ pop_indent()
+ ret = mcgen('''
+static void qmp_init_marshal(void)
+{
+%(registry)s
+}
+
+qapi_init(qmp_init_marshal);
+''',
+ registry=registry.rstrip())
+ return ret
+
+def gen_registry_proxy(commands):
+ registry=""
+ push_indent()
+ for cmd in commands:
+ registry += mcgen('''
+qmp_register_proxy_command("%(name)s", qmp_marshal_input_%(c_name)s,
qmp_proxy_completion_%(c_name)s);
+''',
+ name=cmd['command'], c_name=c_var(cmd['command']))
+ pop_indent()
+ ret = mcgen('''
+static void qmp_init_marshal(void)
+{
+%(registry)s
+}
+
+qapi_init(qmp_init_marshal);
+''',
+ registry=registry.rstrip())
+ return ret
+
+def gen_command_decl_prologue(header, guard, prefix=""):
+ ret = mcgen('''
+/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
+
+#ifndef %(guard)s
+#define %(guard)s
+
+#include "%(prefix)sqapi-types.h"
+#include "error.h"
+//#include "%(header)s"
+
+''',
+ header=basename(h_file), guard=guardname(h_file),
prefix=prefix)
+ return ret
+
+def gen_command_def_prologue(prefix="", proxy=False):
+ ret = mcgen('''
+/* THIS FILE IS AUTOMATICALLY GENERATED, DO NOT MODIFY */
+
+#include "qemu-objects.h"
+#include "qapi/qmp-core.h"
+#include "qapi/qapi-visit-core.h"
+#include "qapi/qmp-output-visiter.h"
+#include "qapi/qmp-input-visiter.h"
+#include "%(prefix)sqapi-types.h"
+#include "%(prefix)sqapi-visit.h"
+
+''',
+ prefix=prefix)
+ if not proxy:
+ ret += '#include "%sqmp-commands.h"' % prefix
+ return ret + "\n"
+
+
+try:
+ opts, args = getopt.gnu_getopt(sys.argv[1:], "p:o:", ["prefix=",
"output-dir=", "type="])
+except getopt.GetoptError, err:
+ print str(err)
+ sys.exit(1)
+
+output_dir = ""
+prefix = ""
+dispatch_type = "sync"
+c_file = 'qmp-marshal.c'
+h_file = 'qmp-commands.h'
+
+for o, a in opts:
+ if o in ("-p", "--prefix"):
+ prefix = a
+ elif o in ("-o", "--output-dir"):
+ output_dir = a + "/"
+ elif o in ("-t", "--type"):
+ dispatch_type = a
+
+c_file = output_dir + prefix + c_file
+h_file = output_dir + prefix + h_file
+
+exprs = parse_schema(sys.stdin)
+commands = filter(lambda expr: expr.has_key('command'), exprs)
+
+if dispatch_type == "sync":
+ fdecl = open(h_file, 'w')
+ fdef = open(c_file, 'w')
+ ret = gen_command_decl_prologue(header=basename(h_file),
guard=guardname(h_file), prefix=prefix)
+ fdecl.write(ret)
+ ret = gen_command_def_prologue(prefix=prefix)
+ fdef.write(ret)
+
+ for cmd in commands:
+ arglist = []
+ ret_type = None
+ if cmd.has_key('data'):
+ arglist = cmd['data']
+ if cmd.has_key('returns'):
+ ret_type = cmd['returns']
+ ret = generate_command_decl(cmd['command'], arglist, ret_type) + "\n"
+ fdecl.write(ret)
+ if ret_type:
+ ret = gen_marshal_output(cmd['command'], arglist, ret_type) + "\n"
+ fdef.write(ret)
+ ret = gen_marshal_input(cmd['command'], arglist, ret_type) + "\n"
+ fdef.write(ret)
+
+ fdecl.write("\n#endif");
+ ret = gen_registry(commands)
+ fdef.write(ret)
+
+ fdef.flush()
+ fdef.close()
+ fdecl.flush()
+ fdecl.close()
+
+elif dispatch_type == "proxy":
+ fdef = open(c_file, 'w')
+ ret = gen_command_def_prologue(prefix=prefix, proxy=True)
+ fdef.write(ret)
+ for cmd in commands:
+ arglist = []
+ ret_type = None
+ if cmd.has_key('data'):
+ arglist = cmd['data']
+ if cmd.has_key('returns'):
+ ret_type = cmd['returns']
+ ret = gen_marshal_input_proxy(cmd['command'], arglist, ret_type) + "\n"
+ fdef.write(ret)
+ ret = gen_registry_proxy(commands)
+ fdef.write(ret)
+
+ fdef.flush()
+ fdef.close()
--
1.7.0.4
- Re: [Qemu-devel] [PATCH v1][ 04/23] qerror: refactor error to make the human message reusable, (continued)
- [Qemu-devel] [PATCH v1][ 05/23] qlist: add qlist_first()/qlist_next(), Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 03/23] error-propagation: build qemu with with error-propagation bits, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 07/23] qapi: add ordereddict/qapi.py helper libraries, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 06/23] qapi: add module init types for qapi, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 08/23] qapi: add qapi-types.py code generator, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 09/23] qapi: add qapi-visit.py code generator, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 10/23] qapi: add qapi-commands.py code generator,
Michael Roth <=
- [Qemu-devel] [PATCH v1][ 11/23] qapi: add qapi-types-core.h, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 12/23] qapi: add qapi-visit-core.h, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 15/23] qapi: add QAPI dealloc visiter, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 13/23] qapi: add QMP input visiter, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 16/23] qapi: add command registration/lookup functions, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 14/23] qapi: add QMP output visiter, Michael Roth, 2011/05/17
- [Qemu-devel] [PATCH v1][ 17/23] qapi: add QMP dispatch functions, Michael Roth, 2011/05/17