[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 01/12] qapi: qapi-types.py, native list support
From: |
Luiz Capitulino |
Subject: |
[Qemu-devel] [PULL 01/12] qapi: qapi-types.py, native list support |
Date: |
Thu, 23 May 2013 14:20:21 -0400 |
From: Michael Roth <address@hidden>
Teach type generators about native types so they can generate the
appropriate linked list types.
Signed-off-by: Michael Roth <address@hidden>
Reviewed-by: Laszlo Ersek <address@hidden>
Reviewed-by: Amos Kong <address@hidden>
Signed-off-by: Luiz Capitulino <address@hidden>
---
scripts/qapi-types.py | 45 ++++++++++++++++++++++++++++++++++++++++++---
scripts/qapi.py | 23 +++++++++++++++++++++++
2 files changed, 65 insertions(+), 3 deletions(-)
diff --git a/scripts/qapi-types.py b/scripts/qapi-types.py
index 9e19920..fd42d71 100644
--- a/scripts/qapi-types.py
+++ b/scripts/qapi-types.py
@@ -16,8 +16,21 @@ import os
import getopt
import errno
-def generate_fwd_struct(name, members):
+def generate_fwd_struct(name, members, builtin_type=False):
+ if builtin_type:
+ return mcgen('''
+
+typedef struct %(name)sList
+{
+ %(type)s value;
+ struct %(name)sList *next;
+} %(name)sList;
+''',
+ type=c_type(name),
+ name=name)
+
return mcgen('''
+
typedef struct %(name)s %(name)s;
typedef struct %(name)sList
@@ -164,6 +177,7 @@ void qapi_free_%(type)s(%(c_type)s obj);
def generate_type_cleanup(name):
ret = mcgen('''
+
void qapi_free_%(type)s(%(c_type)s obj)
{
QapiDeallocVisitor *md;
@@ -184,8 +198,9 @@ void qapi_free_%(type)s(%(c_type)s obj)
try:
- opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:",
- ["source", "header", "prefix=",
"output-dir="])
+ opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
+ ["source", "header", "builtins",
+ "prefix=", "output-dir="])
except getopt.GetoptError, err:
print str(err)
sys.exit(1)
@@ -197,6 +212,7 @@ h_file = 'qapi-types.h'
do_c = False
do_h = False
+do_builtins = False
for o, a in opts:
if o in ("-p", "--prefix"):
@@ -207,6 +223,8 @@ for o, a in opts:
do_c = True
elif o in ("-h", "--header"):
do_h = True
+ elif o in ("-b", "--builtins"):
+ do_builtins = True
if not do_c and not do_h:
do_c = True
@@ -282,6 +300,11 @@ fdecl.write(mcgen('''
exprs = parse_schema(sys.stdin)
exprs = filter(lambda expr: not expr.has_key('gen'), exprs)
+fdecl.write(guardstart("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
+for typename in builtin_types:
+ fdecl.write(generate_fwd_struct(typename, None, builtin_type=True))
+fdecl.write(guardend("QAPI_TYPES_BUILTIN_STRUCT_DECL"))
+
for expr in exprs:
ret = "\n"
if expr.has_key('type'):
@@ -298,6 +321,22 @@ for expr in exprs:
continue
fdecl.write(ret)
+# to avoid header dependency hell, we always generate declarations
+# for built-in types in our header files and simply guard them
+fdecl.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))
+for typename in builtin_types:
+ fdecl.write(generate_type_cleanup_decl(typename + "List"))
+fdecl.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DECL"))
+
+# ...this doesn't work for cases where we link in multiple objects that
+# have the functions defined, so we use -b option to provide control
+# over these cases
+if do_builtins:
+ fdef.write(guardstart("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))
+ for typename in builtin_types:
+ fdef.write(generate_type_cleanup(typename + "List"))
+ fdef.write(guardend("QAPI_TYPES_BUILTIN_CLEANUP_DEF"))
+
for expr in exprs:
ret = "\n"
if expr.has_key('type'):
diff --git a/scripts/qapi.py b/scripts/qapi.py
index afc5f32..02ad668 100644
--- a/scripts/qapi.py
+++ b/scripts/qapi.py
@@ -11,6 +11,12 @@
from ordereddict import OrderedDict
+builtin_types = [
+ 'str', 'int', 'number', 'bool',
+ 'int8', 'int16', 'int32', 'int64',
+ 'uint8', 'uint16', 'uint32', 'uint64'
+]
+
def tokenize(data):
while len(data):
ch = data[0]
@@ -242,3 +248,20 @@ def guardname(filename):
for substr in [".", " ", "-"]:
guard = guard.replace(substr, "_")
return guard.upper() + '_H'
+
+def guardstart(name):
+ return mcgen('''
+
+#ifndef %(name)s
+#define %(name)s
+
+''',
+ name=guardname(name))
+
+def guardend(name):
+ return mcgen('''
+
+#endif /* %(name)s */
+
+''',
+ name=guardname(name))
--
1.8.1.4
- [Qemu-devel] [PULL 00/12] QMP queue, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 01/12] qapi: qapi-types.py, native list support,
Luiz Capitulino <=
- [Qemu-devel] [PULL 02/12] qapi: qapi-visit.py, fix list handling for union types, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 03/12] qapi: qapi-visit.py, native list support, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 05/12] json-parser: fix handling of large whole number values, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 06/12] qapi: add QMP input test for large integers, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 04/12] qapi: enable generation of native list code, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 07/12] qapi: fix visitor serialization tests for numbers/doubles, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 12/12] monitor: allow to disable the default monitor, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 08/12] qapi: add native list coverage for visitor serialization tests, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 11/12] ui/input.c: replace magic numbers with macros, Luiz Capitulino, 2013/05/23
- [Qemu-devel] [PULL 10/12] qapi: add native list coverage for QMP input visitor tests, Luiz Capitulino, 2013/05/23