# 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)
# smx_host_t h)
if self.simcalls_PRE is None:
self.simcalls_PRE = set()
- for fn in glob.glob('smx_*') + glob.glob('../mc/*'):
+ for fn in glob.glob('smx_*') + glob.glob('ActorImpl*') + 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:
assert match, line
ret, name, args, attrs = match.groups()
sargs = []
- if not re.match("^\s*$", args):
+ if not re.match(r"^\s*$", args):
for arg in re.split(",", args):
args = args.strip()
- match = re.match("^(.*?)\s*?(\S+)$", arg)
+ match = re.match(r"^(.*?)\s*?(\S+)$", arg)
t, n = match.groups()
t = t.strip()
n = n.strip()
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",\n')
- fd.write(' SIMIX_process_get_name(simcall->issuer),\n')
- fd.write(
- ' sg_host_get_name(SIMIX_process_get_host(simcall->issuer))\n')
+ fd.write(' THROWF(arg_error,0,"Asked to do the noop syscall on %s@%s",\n')
+ fd.write(' simcall->issuer->name.c_str(),\n')
+ fd.write(' sg_host_get_name(simcall->issuer->host)\n')
fd.write(' );\n')
fd.write(' break;\n')
fd.write('\n')