import re
import glob
-
+import sys
class Arg(object):
# smx_host_t h)
if self.simcalls_pre is None:
self.simcalls_pre = set()
- for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + \
+ for fn in glob.glob('smx_*') + glob.glob('../kernel/actor/ActorImpl*') + \
glob.glob('../mc/*cpp') + glob.glob('../kernel/activity/*cpp'):
f = open(fn)
self.simcalls_pre |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
def case(self):
res = []
+ indent = ' '
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()))
+ res.append(indent + 'case SIMCALL_%s:' % (self.name.upper()))
if self.need_handler:
call = "simcall_HANDLER_%s(simcall%s%s)" % (self.name,
", " if len(args) > 0 else "",
else:
call = "SIMIX_%s(%s)" % (self.name, ', '.join(args))
if self.call_kind == 'Func':
- res.append(" simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call))
+ res.append(indent + " simgrid::simix::marshal<%s>(simcall->result, %s);" % (self.res.rettype(), call))
else:
- res.append(" " + call + ";")
+ res.append(indent + " " + call + ";")
if self.call_kind != 'Blck':
- res.append(' SIMIX_simcall_answer(simcall);')
- res.append(' break;')
+ res.append(indent + ' SIMIX_simcall_answer(simcall);')
+ res.append(indent + ' break;')
res.append('')
return '\n'.join(res)
continue
match = re.match(
r'^(\S+)\s+([^\)\(\s]+)\s*\(*(.*)\)\s*(\[\[.*\]\])?\s*;\s*?$', line)
- assert match, line
+ if not match:
+ raise AssertionError(line)
ret, name, args, attrs = match.groups()
sargs = []
if not re.match(r"^\s*$", args):
elif attr == "nohandler":
handler = False
else:
- assert False, "Unknown attribute %s in: %s" % (attr, line)
+ raise AssertionError("Unknown attribute %s in: %s" % (attr, line))
sim = Simcall(name, handler, Arg('result', ret), sargs, ans)
if resdi is None:
simcalls.append(sim)
for guard, ll in guarded_simcalls.items():
fd.write('\n#if %s\n' % (guard))
fd.write('\n'.join(func(simcall) for simcall in ll))
- fd.write('\n#endif\n')
+ fd.write('\n#endif')
+ fd.write('\n')
if __name__ == '__main__':
simcalls, simcalls_dict = parse('simcalls.in')
ok &= all(map(Simcall.check, simcalls))
for k, v in simcalls_dict.items():
ok &= all(map(Simcall.check, v))
- # FIXME: we should not hide it
- # if not ok:
- # print ("Some checks fail!")
- # sys.exit(1)
+ if not ok:
+ print ("Some checks fail!")
+ sys.exit(1)
#
# popping_accessors.hpp
fd.write('#include "src/simix/popping_private.hpp"')
handle(fd, Simcall.accessors, simcalls, simcalls_dict)
fd.write(
- "\n\n/* The prototype of all simcall handlers, automatically generated for you */\n\n")
+ "\n/* The prototype of all simcall handlers, automatically generated for you */\n\n")
handle(fd, Simcall.handler_prototype, simcalls, simcalls_dict)
fd.close()
handle(fd, Simcall.enum, simcalls, simcalls_dict)
- fd.write('\n')
fd.write(' NUM_SIMCALLS\n')
fd.write('} e_smx_simcall_t;\n')
fd.close()
fd.write(' "SIMCALL_NONE",\n')
handle(fd, Simcall.string, simcalls, simcalls_dict)
- fd.write('\n};\n\n')
+ fd.write('};\n\n')
fd.write('/** @private\n')
fd.write(
fd.write(' case NUM_SIMCALLS:\n')
fd.write(' break;\n')
fd.write(' case SIMCALL_NONE:\n')
- fd.write(' THROWF(arg_error, 0, "Asked to do the noop syscall on %s@%s", simcall->issuer->get_cname(),\n')
- fd.write(' sg_host_get_name(simcall->issuer->get_host()));\n')
+ fd.write(' throw std::invalid_argument(simgrid::xbt::string_printf("Asked to do the noop syscall on %s@%s",\n')
+ fd.write(' simcall->issuer->get_cname(),\n')
+ fd.write(' sg_host_get_name(simcall->issuer->get_host())));\n')
fd.write(' default:\n')
fd.write(' THROW_IMPOSSIBLE;\n')
fd.write(' }\n')
fd.write('#include "xbt/ex.h"\n')
fd.write('#include <functional>\n')
fd.write('#include <simgrid/simix.hpp>\n')
+ fd.write('#include <xbt/log.h>\n')
fd.write("/** @cond */ // Please Doxygen, don't look at this\n")
fd.write('''
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix);
+
template<class R, class... T>
inline static R simcall(e_smx_simcall_t call, T const&... t)
{
}
''')
handle(fd, Simcall.body, simcalls, simcalls_dict)
- fd.write(" /** @endcond */\n")
+ fd.write("/** @endcond */\n")
fd.close()