import binascii
import os
+# Ensure we don't leave temporary files around
+sys.dont_write_bytecode = True
+
#
# VPP API language
#
# Global dictionary of new types (including enums)
global_types = {}
+global_crc = 0
def global_type_add(name):
# All your trace are belong to us!
def exception_handler(exception_type, exception, traceback):
- print ("%s: %s" % (exception_type.__name__, exception))
+ print("%s: %s" % (exception_type.__name__, exception))
#
# A string containing ignored characters (spaces and tabs)
t_ignore = ' \t'
+
class Service():
def __init__(self, caller, reply, events=[], stream=False):
self.caller = caller
class Typedef():
def __init__(self, name, flags, block):
+ global global_crc
self.name = name
self.flags = flags
self.block = block
self.crc = binascii.crc32(str(block)) & 0xffffffff
+ global_crc = binascii.crc32(str(block), global_crc)
global_type_add(name)
def __repr__(self):
class Define():
def __init__(self, name, flags, block):
+ global global_crc
self.name = name
self.flags = flags
self.block = block
self.crc = binascii.crc32(str(block)) & 0xffffffff
+ global_crc = binascii.crc32(str(block), global_crc)
self.typeonly = False
self.dont_trace = False
self.manual_print = False
class Enum():
def __init__(self, name, block, enumtype='u32'):
+ global global_crc
self.name = name
self.enumtype = enumtype
count = 0
self.block = block
self.crc = binascii.crc32(str(block)) & 0xffffffff
+ global_crc = binascii.crc32(str(block), global_crc)
global_type_add(name)
def __repr__(self):
class Option():
def __init__(self, option):
+ global global_crc
self.option = option
self.crc = binascii.crc32(str(option)) & 0xffffffff
+ global_crc = binascii.crc32(str(option), global_crc)
def __repr__(self):
return str(self.option)
| RPC ID RETURNS ID EVENTS event_list ';' '''
if p[2] == p[4]:
# Verify that caller and reply differ
- self._parse_error('Reply ID ({}) should not be equal to Caller ID'.format(p[2]),
- self._token_coord(p, 1))
+ self._parse_error(
+ 'Reply ID ({}) should not be equal to Caller ID'.format(p[2]),
+ self._token_coord(p, 1))
if len(p) == 8:
p[0] = Service(p[2], p[4], p[6])
elif len(p) == 7:
def __init__(self, debug=False, filename='', logger=None):
self.lexer = lex.lex(module=VPPAPILexer(filename), debug=debug)
self.parser = yacc.yacc(module=VPPAPIParser(filename, logger),
- tabmodule='vppapigentab', debug=debug)
+ write_tables=False, debug=debug)
self.logger = logger
def parse_string(self, code, debug=0, lineno=1):
if isinstance(o2, Service):
s['services'].append(o2)
-
msgs = {d.name: d for d in s['defines']}
svcs = {s.caller: s for s in s['services']}
replies = {s.reply: s for s in s['services']}
for service in svcs:
if service not in msgs:
- raise ValueError('Service definition refers to unknown message'
- ' definition: {}'.format(service))
- if svcs[service].reply != 'null' and svcs[service].reply not in msgs:
+ raise ValueError(
+ 'Service definition refers to unknown message'
+ ' definition: {}'.format(service))
+ if svcs[service].reply != 'null' and \
+ svcs[service].reply not in msgs:
raise ValueError('Service definition refers to unknown message'
' definition in reply: {}'
.format(svcs[service].reply))
continue
if msgs[d].singular is True:
continue
- #if d.endswith('_counters'):
- # continue
- #if d.endswith('_event'):
- # continue
if d.endswith('_reply'):
if d[:-6] in svcs:
continue
if d[:-6] not in msgs:
- self.logger.warning('{} missing calling message'
- .format(d))
+ raise ValueError('{} missing calling message'
+ .format(d))
continue
if d.endswith('_dump'):
if d in svcs:
s['services'].append(Service(d, d[:-5]+'_details',
stream=True))
else:
- self.logger.error('{} missing details message'
- .format(d))
+ raise ValueError('{} missing details message'
+ .format(d))
continue
if d.endswith('_details'):
if d[:-8]+'_dump' not in msgs:
- self.logger.error('{} missing dump message'
- .format(d))
+ raise ValueError('{} missing dump message'
+ .format(d))
continue
if d in svcs:
if d+'_reply' in msgs:
s['services'].append(Service(d, d+'_reply'))
else:
- self.logger.warning('{} missing reply message ({})'
- .format(d, d+'_reply'))
- s['services'].append(Service(d, None))
+ raise ValueError(
+ '{} missing reply message ({}) or service definition'
+ .format(d, d+'_reply'))
return s
imported_objs = []
for o in objs:
if isinstance(o, Import):
- return objs + self.process_imports(o.result, True)
+ return self.process_imports(o.result, True) + objs
if in_import:
if isinstance(o, Define) and o.typeonly:
imported_objs.append(o)
return s
-def getcrc(s):
- return binascii.crc32(str(s)) & 0xffffffff
-
-
dirlist = []
logging.basicConfig()
log = logging.getLogger('vppapigen')
-
parser = VPPAPI(debug=args.debug, filename=filename, logger=log)
result = parser.parse_file(args.input, log)
# Add msg_id field
s['defines'] = add_msg_id(s['defines'])
- file_crc = getcrc(s)
+ file_crc = global_crc & 0xffffffff
#
# Debug
if not args.pluginpath:
cand = []
cand.append(os.path.dirname(os.path.realpath(__file__)))
- cand.append(os.path.dirname(os.path.realpath(__file__)) + \
+ cand.append(os.path.dirname(os.path.realpath(__file__)) +
'/../share/vpp/')
for c in cand:
c += '/'
result = plugin.run(filename, s, file_crc)
if result:
- print (result, file=args.output)
+ print(result, file=args.output)
else:
raise Exception('Running plugin failed: {} {}'
.format(filename, result))
Code Review / vpp.git / blobdiff