X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=src%2Ftools%2Fvppapigen%2Fvppapigen.py;h=fd87b18792b9ed85b99cdaeb82491d85961fb27e;hb=85465588b18fef9c4712f864f512e00741e2d4f2;hp=4ca9b954e671bed432f2b410151c554b514013a5;hpb=58914254f0abb0f6c69d866e84915d469d128bd8;p=vpp.git diff --git a/src/tools/vppapigen/vppapigen.py b/src/tools/vppapigen/vppapigen.py index 4ca9b954e67..fd87b18792b 100755 --- a/src/tools/vppapigen/vppapigen.py +++ b/src/tools/vppapigen/vppapigen.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python +#!/usr/bin/python3 from __future__ import print_function import ply.lex as lex @@ -18,15 +18,14 @@ sys.dont_write_bytecode = True # Global dictionary of new types (including enums) global_types = {} -global_crc = 0 -def global_type_add(name): +def global_type_add(name, obj): '''Add new type to the dictionary of types ''' type_name = 'vl_api_' + name + '_t' if type_name in global_types: raise KeyError('Type is already defined: {}'.format(name)) - global_types[type_name] = True + global_types[type_name] = obj # All your trace are belong to us! @@ -122,22 +121,16 @@ class VPPAPILexer(object): t_ignore = ' \t' -# -# Side-effect: Sets global_crc -# -def crc_block(block): - global global_crc +def crc_block_combine(block, crc): s = str(block).encode() - global_crc = binascii.crc32(s, global_crc) - return binascii.crc32(s) & 0xffffffff - + return binascii.crc32(s, crc) & 0xffffffff class Service(): - def __init__(self, caller, reply, events=[], stream=False): + def __init__(self, caller, reply, events=None, stream=False): self.caller = caller self.reply = reply self.stream = stream - self.events = events + self.events = [] if events is None else events class Typedef(): @@ -145,7 +138,7 @@ class Typedef(): self.name = name self.flags = flags self.block = block - self.crc = crc_block(block) + self.crc = str(block).encode() self.manual_print = False self.manual_endian = False for f in flags: @@ -153,7 +146,7 @@ class Typedef(): self.manual_print = True elif f == 'manual_endian': self.manual_endian = True - global_type_add(name) + global_type_add(name, self) def __repr__(self): return self.name + str(self.flags) + str(self.block) @@ -161,18 +154,16 @@ class Typedef(): class Using(): def __init__(self, name, alias): - global global_crc self.name = name if isinstance(alias, Array): - a = { 'type': alias.fieldtype, - 'length': alias.length } + a = { 'type': alias.fieldtype, # noqa: E201 + 'length': alias.length } # noqa: E202 else: - a = { 'type': alias.fieldtype } + a = { 'type': alias.fieldtype } # noqa: E201,E202 self.alias = a - self.crc = binascii.crc32(str(alias)) & 0xffffffff - global_crc = binascii.crc32(str(alias), global_crc) - global_type_add(name) + self.crc = str(alias).encode() + global_type_add(name, self) def __repr__(self): return self.name + str(self.alias) @@ -183,11 +174,10 @@ class Union(): self.type = 'Union' self.manual_print = False self.manual_endian = False - global global_crc self.name = name self.block = block - self.crc = crc_block(block) - global_type_add(name) + self.crc = str(block).encode() + global_type_add(name, self) def __repr__(self): return str(self.block) @@ -198,7 +188,7 @@ class Define(): self.name = name self.flags = flags self.block = block - self.crc = crc_block(block) + self.crc = str(block).encode() self.dont_trace = False self.manual_print = False self.manual_endian = False @@ -238,8 +228,8 @@ class Enum(): block[i] = [b, count] self.block = block - self.crc = crc_block(block) - global_type_add(name) + self.crc = str(block).encode() + global_type_add(name, self) def __repr__(self): return self.name + str(self.block) @@ -271,7 +261,7 @@ class Import(): class Option(): def __init__(self, option): self.option = option - self.crc = crc_block(option) + self.crc = str(option).encode() def __repr__(self): return str(self.option) @@ -298,10 +288,11 @@ class Array(): class Field(): - def __init__(self, fieldtype, name): + def __init__(self, fieldtype, name, limit=None): self.type = 'Field' self.fieldtype = fieldtype self.fieldname = name + self.limit = limit def __repr__(self): return str([self.fieldtype, self.fieldname]) @@ -504,7 +495,7 @@ class VPPAPIParser(object): def p_enum_statements(self, p): '''enum_statements : enum_statement - | enum_statements enum_statement''' + | enum_statements enum_statement''' if len(p) == 2: p[0] = [p[1]] else: @@ -518,12 +509,30 @@ class VPPAPIParser(object): else: p[0] = p[1] + def p_field_options(self, p): + '''field_options : field_option + | field_options field_option''' + if len(p) == 2: + p[0] = p[1] + else: + p[0] = { **p[1], **p[2] } + + def p_field_option(self, p): + '''field_option : ID '=' assignee ',' + | ID '=' assignee + ''' + p[0] = { p[1]: p[3] } + def p_declaration(self, p): - '''declaration : type_specifier ID ';' ''' - if len(p) != 4: + '''declaration : type_specifier ID ';' + | type_specifier ID '[' field_options ']' ';' ''' + if len(p) == 7: + p[0] = Field(p[1], p[2], p[4]) + elif len(p) == 4: + p[0] = Field(p[1], p[2]) + else: self._parse_error('ERROR') self.fields.append(p[2]) - p[0] = Field(p[1], p[2]) def p_declaration_array(self, p): '''declaration : type_specifier ID '[' NUM ']' ';' @@ -623,8 +632,13 @@ class VPPAPI(object): s['types'] = [] s['Import'] = [] s['Alias'] = {} + crc = 0 for o in objs: tname = o.__class__.__name__ + try: + crc = binascii.crc32(o.crc, crc) + except AttributeError: + pass if isinstance(o, Define): s[tname].append(o) if o.autoreply: @@ -652,6 +666,8 @@ class VPPAPI(object): replies = {s.reply: s for s in s['Service']} seen_services = {} + s['file_crc'] = crc + for service in svcs: if service not in msgs: raise ValueError( @@ -748,6 +764,23 @@ def dirlist_add(dirs): def dirlist_get(): return dirlist +def foldup_blocks(block, crc): + for b in block: + # Look up CRC in user defined types + if b.fieldtype.startswith('vl_api_'): + # Recursively + t = global_types[b.fieldtype] + try: + crc = crc_block_combine(t.block, crc) + return foldup_blocks(t.block, crc) + except: + pass + return crc + +def foldup_crcs(s): + for f in s: + f.crc = foldup_blocks(f.block, + binascii.crc32(f.crc)) # # Main @@ -759,12 +792,17 @@ def main(): if sys.version[0] == '2': cliparser.add_argument('--input', type=argparse.FileType('r'), default=sys.stdin) + cliparser.add_argument('--output', nargs='?', + type=argparse.FileType('w'), + default=sys.stdout) + else: cliparser.add_argument('--input', type=argparse.FileType('r', encoding='UTF-8'), default=sys.stdin) - cliparser.add_argument('--output', nargs='?', type=argparse.FileType('w'), - default=sys.stdout) + cliparser.add_argument('--output', nargs='?', + type=argparse.FileType('w', encoding='UTF-8'), + default=sys.stdout) cliparser.add_argument('output_module', nargs='?', default='C') cliparser.add_argument('--debug', action='store_true') @@ -800,7 +838,8 @@ def main(): # Add msg_id field s['Define'] = add_msg_id(s['Define']) - file_crc = global_crc & 0xffffffff + # Fold up CRCs + foldup_crcs(s['Define']) # # Debug @@ -815,7 +854,7 @@ def main(): # # Generate representation # - import imp + from importlib.machinery import SourceFileLoader # Default path pluginpath = '' @@ -838,12 +877,13 @@ def main(): args.output_module.lower()) try: - plugin = imp.load_source(args.output_module, module_path) + plugin = SourceFileLoader(args.output_module, + module_path).load_module() except Exception as err: raise Exception('Error importing output plugin: {}, {}' .format(module_path, err)) - result = plugin.run(filename, s, file_crc) + result = plugin.run(filename, s) if result: print(result, file=args.output) else: