# 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/*cpp'):
f = open(fn)
self.simcalls_PRE |= set(re.findall(r'simcall_HANDLER_(.*?)\(', f.read()))
f.close()
return ' SIMCALL_%s,' % (self.name.upper())
def string(self):
- return ' "SIMCALL_%s",' % self.name.upper()
+ return ' "SIMCALL_%s",' % self.name.upper()
def accessors(self):
res = []
'/** @brief Simcalls\' names (generated from src/simix/simcalls.in) */\n')
fd.write('const char* simcall_names[] = {\n')
- fd.write(' "SIMCALL_NONE",')
+ fd.write(' "SIMCALL_NONE",\n')
handle(fd, Simcall.string, simcalls, simcalls_dict)
- fd.write('};\n\n')
+ fd.write('\n};\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",\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')
template<class R, class... T>
inline static R simcall(e_smx_simcall_t call, T const&... t)
{
- smx_process_t self = SIMIX_process_self();
+ smx_actor_t self = SIMIX_process_self();
simgrid::simix::marshal(&self->simcall, call, t...);
if (self != simix_global->maestro_process) {
XBT_DEBUG("Yield process '%s' on simcall %s (%d)", self->name.c_str(),