#!/usr/bin/env python
# -*- coding: utf-8 -*-
-# Copyright (c) 2014-2015. The SimGrid Team. All rights reserved.
+# Copyright (c) 2014-2016. The SimGrid Team. All rights reserved.
# This program is free software; you can redistribute it and/or modify it
# under the terms of the license (GNU LGPL) which comes with this package.
# libsmx.c simcall_BODY_
if self.simcalls_BODY is None:
f = open('libsmx.cpp')
- self.simcalls_BODY = set(
- re.findall('simcall_BODY_(.*?)\(', f.read()))
+ self.simcalls_BODY = set(re.findall(r'simcall_BODY_(.*?)\(', f.read()))
f.close()
if self.name not in self.simcalls_BODY:
- print '# ERROR: No function calling simcall_BODY_%s' % self.name
- print '# Add something like this to libsmx.c:'
- print '%s simcall_%s(%s) {' % (self.res.rettype(), self.name, ', '.join('%s %s' % (arg.rettype(), arg.name) for arg in self.args))
- print ' return simcall_BODY_%s(%s);' % (self.name)
- print '}'
+ print ('# ERROR: No function calling simcall_BODY_%s' % self.name)
+ print ('# Add something like this to libsmx.c:')
+ print ('%s simcall_%s(%s) {' % (self.res.rettype(), self.name, ', '.
+ join('%s %s' % (arg.rettype(), arg.name) for arg in self.args)))
+ print (' return simcall_BODY_%s(%s);' % (self.name, "..."))
+ print ('}')
return False
# smx_*.c void simcall_HANDLER_host_on(smx_simcall_t simcall,
self.simcalls_PRE = set()
for fn in glob.glob('smx_*') + glob.glob('../mc/*'):
f = open(fn)
- self.simcalls_PRE |= set(
- re.findall('simcall_HANDLER_(.*?)\(', f.read()))
+ self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
f.close()
if self.need_handler:
- if (self.name not in self.simcalls_PRE):
- print '# ERROR: No function called simcall_HANDLER_%s' % self.name
- print '# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):'
- print '%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {' % (self.res.rettype(), self.name, ''.join(', %s %s' % (arg.rettype(), arg.name)
- for arg in self.args))
- print ' // Your code handling the simcall'
- print '}'
+ if self.name not in self.simcalls_PRE:
+ print ('# ERROR: No function called simcall_HANDLER_%s' % self.name)
+ print ('# Add something like this to the relevant C file (like smx_io.c if it\'s an IO call):')
+ print ('%s simcall_HANDLER_%s(smx_simcall_t simcall%s) {' % (self.res.rettype(), self.name, ''.
+ join(', %s %s' % (arg.rettype(), arg.name)for arg in self.args)))
+ print (' // Your code handling the simcall')
+ print ('}')
return False
else:
- if (self.name in self.simcalls_PRE):
- print '# ERROR: You have a function called simcall_HANDLER_%s, but that simcall is not using any handler' % self.name
- print '# Either change your simcall definition, or kill that function'
+ if self.name in self.simcalls_PRE:
+ print ('# ERROR: You have a function called simcall_HANDLER_%s, but that simcall is not using any handler' % self.name)
+ print ('# Either change your simcall definition, or kill that function')
return False
return True
def case(self):
res = []
- args = [ ("simgrid::simix::unmarshal<%s>(simcall->args[%d])" % (arg.rettype(), i))
+ args = [ "simgrid::simix::unmarshal<%s>(simcall->args[%d])" % (arg.rettype(), i)
for i, arg in enumerate(self.args) ]
res.append('case SIMCALL_%s:' % (self.name.upper()))
if self.need_handler:
res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call))
else:
res.append(" " + call + ";");
- res.append(' %sbreak; \n' %
- ('SIMIX_simcall_answer(simcall);\n ' if self.call_kind != 'Blck' else ' '))
+ if self.call_kind != 'Blck':
+ res.append(' SIMIX_simcall_answer(simcall);')
+ res.append(' break;')
+ res.append('')
return '\n'.join(res)
def body(self):
if line.startswith('#') or not line:
continue
match = re.match(
- r'(\S*?) *(\S*?) *(\S*?) *\((.*?)(?:, *(.*?))?\) *(.*)', line)
+ r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
assert match, line
- ans, handler, name, rest, resc, args = match.groups()
- assert (ans == 'Proc' or ans == 'Func' or ans == 'Blck'), "Invalid call type: '%s'. Faulty line:\n%s\n" % (
- ans, line)
- assert (handler == 'H' or handler == '-'), "Invalid need_handler indication: '%s'. Faulty line:\n%s\n" % (
- handler, line)
+ ret, name, args, attrs = match.groups()
sargs = []
- for n, t in re.findall(r'\((.*?), *(.*?)\)', args):
- sargs.append(Arg(n, t))
- sim = Simcall(name, handler == 'H',
- Arg('result', rest), sargs, ans)
+ if not re.match(r"^\s*$", args):
+ for arg in re.split(",", args):
+ args = args.strip()
+ match = re.match(r"^(.*?)\s*?(\S+)$", arg)
+ t, n = match.groups()
+ t = t.strip()
+ n = n.strip()
+ sargs.append(Arg(n, t))
+ if ret == "void":
+ ans = "Proc"
+ else:
+ ans = "Func"
+ handler = True
+ if attrs:
+ attrs = attrs[2:-2]
+ for attr in re.split(",", attrs):
+ if attr == "block":
+ ans = "Blck"
+ elif attr == "nohandler":
+ handler = False
+ else:
+ assert False, "Unknown attribute %s in: %s" % (attr, line)
+ sim = Simcall(name, handler, Arg('result', ret), sargs, ans)
if resdi is None:
simcalls.append(sim)
else:
# smx_popping_bodies.cpp
#
fd = header('popping_bodies.cpp')
+ fd.write('#include <functional>\n')
fd.write('#include "smx_private.h"\n')
fd.write('#include "src/mc/mc_forward.hpp"\n')
fd.write('#include "xbt/ex.h"\n')
