qapi: qapi-types.py, native list support
Teach type generators about native types so they can generate the appropriate linked list types. Signed-off-by: Michael Roth <mdroth@linux.vnet.ibm.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Amos Kong <akong@redhat.com> Signed-off-by: Luiz Capitulino <lcapitulino@redhat.com>
This commit is contained in:
parent
95de21a430
commit
c0afa9c5f7
|
@ -16,8 +16,21 @@ import os
|
||||||
import getopt
|
import getopt
|
||||||
import errno
|
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('''
|
return mcgen('''
|
||||||
|
|
||||||
typedef struct %(name)s %(name)s;
|
typedef struct %(name)s %(name)s;
|
||||||
|
|
||||||
typedef struct %(name)sList
|
typedef struct %(name)sList
|
||||||
|
@ -164,6 +177,7 @@ void qapi_free_%(type)s(%(c_type)s obj);
|
||||||
|
|
||||||
def generate_type_cleanup(name):
|
def generate_type_cleanup(name):
|
||||||
ret = mcgen('''
|
ret = mcgen('''
|
||||||
|
|
||||||
void qapi_free_%(type)s(%(c_type)s obj)
|
void qapi_free_%(type)s(%(c_type)s obj)
|
||||||
{
|
{
|
||||||
QapiDeallocVisitor *md;
|
QapiDeallocVisitor *md;
|
||||||
|
@ -184,8 +198,9 @@ void qapi_free_%(type)s(%(c_type)s obj)
|
||||||
|
|
||||||
|
|
||||||
try:
|
try:
|
||||||
opts, args = getopt.gnu_getopt(sys.argv[1:], "chp:o:",
|
opts, args = getopt.gnu_getopt(sys.argv[1:], "chbp:o:",
|
||||||
["source", "header", "prefix=", "output-dir="])
|
["source", "header", "builtins",
|
||||||
|
"prefix=", "output-dir="])
|
||||||
except getopt.GetoptError, err:
|
except getopt.GetoptError, err:
|
||||||
print str(err)
|
print str(err)
|
||||||
sys.exit(1)
|
sys.exit(1)
|
||||||
|
@ -197,6 +212,7 @@ h_file = 'qapi-types.h'
|
||||||
|
|
||||||
do_c = False
|
do_c = False
|
||||||
do_h = False
|
do_h = False
|
||||||
|
do_builtins = False
|
||||||
|
|
||||||
for o, a in opts:
|
for o, a in opts:
|
||||||
if o in ("-p", "--prefix"):
|
if o in ("-p", "--prefix"):
|
||||||
|
@ -207,6 +223,8 @@ for o, a in opts:
|
||||||
do_c = True
|
do_c = True
|
||||||
elif o in ("-h", "--header"):
|
elif o in ("-h", "--header"):
|
||||||
do_h = True
|
do_h = True
|
||||||
|
elif o in ("-b", "--builtins"):
|
||||||
|
do_builtins = True
|
||||||
|
|
||||||
if not do_c and not do_h:
|
if not do_c and not do_h:
|
||||||
do_c = True
|
do_c = True
|
||||||
|
@ -282,6 +300,11 @@ fdecl.write(mcgen('''
|
||||||
exprs = parse_schema(sys.stdin)
|
exprs = parse_schema(sys.stdin)
|
||||||
exprs = filter(lambda expr: not expr.has_key('gen'), exprs)
|
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:
|
for expr in exprs:
|
||||||
ret = "\n"
|
ret = "\n"
|
||||||
if expr.has_key('type'):
|
if expr.has_key('type'):
|
||||||
|
@ -298,6 +321,22 @@ for expr in exprs:
|
||||||
continue
|
continue
|
||||||
fdecl.write(ret)
|
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:
|
for expr in exprs:
|
||||||
ret = "\n"
|
ret = "\n"
|
||||||
if expr.has_key('type'):
|
if expr.has_key('type'):
|
||||||
|
|
|
@ -11,6 +11,12 @@
|
||||||
|
|
||||||
from ordereddict import OrderedDict
|
from ordereddict import OrderedDict
|
||||||
|
|
||||||
|
builtin_types = [
|
||||||
|
'str', 'int', 'number', 'bool',
|
||||||
|
'int8', 'int16', 'int32', 'int64',
|
||||||
|
'uint8', 'uint16', 'uint32', 'uint64'
|
||||||
|
]
|
||||||
|
|
||||||
def tokenize(data):
|
def tokenize(data):
|
||||||
while len(data):
|
while len(data):
|
||||||
ch = data[0]
|
ch = data[0]
|
||||||
|
@ -242,3 +248,20 @@ def guardname(filename):
|
||||||
for substr in [".", " ", "-"]:
|
for substr in [".", " ", "-"]:
|
||||||
guard = guard.replace(substr, "_")
|
guard = guard.replace(substr, "_")
|
||||||
return guard.upper() + '_H'
|
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))
|
||||||
|
|
Loading…
Reference in a new issue