''.join(', %s simcall->args[%d].%s'%(arg.cast(), i, arg.field())
for i, arg in enumerate(self.args))))
else:
- res.append(' %ssimcall_%s(%s);'%('simcall->result.%s = '%self.res.field() if self.call_kind == 'Func' else ' ',
+ res.append(' %sSIMIX_%s(%s);'%('simcall->result.%s = '%self.res.field() if self.call_kind == 'Func' else ' ',
self.name,
','.join('%s simcall->args[%d].%s'%(arg.cast(), i, arg.field())
for i, arg in enumerate(self.args))))
res.append(' if (0) simcall_HANDLER_%s(%s);'%(self.name,
', '.join(["&self->simcall"]+ [arg.name for arg in self.args])))
else:
- res.append(' if (0) simcall_%s(%s);'%(self.name,
+ res.append(' if (0) SIMIX_%s(%s);'%(self.name,
', '.join(arg.name for arg in self.args)))
res.append(' /* end of the guide intended to the poor programmer wanting to go from MSG to Surf */')
res.append('')
return fd
def handle(fd,func, simcalls, guarded_simcalls):
- fd.write('\n'.join(func(simcall) for simcall in simcalls))
+ def nonempty(e): return e != ''
+ fd.write('\n'.join( filter(nonempty, (func(simcall) for simcall in simcalls))))
+
for guard, list in guarded_simcalls.items():
fd.write('\n#ifdef %s\n'%(guard))
fd.write('\n'.join(func(simcall) for simcall in list))
fd.write('#include "smx_private.h"\n');
fd.write('#ifdef HAVE_MC\n');
- fd.write('#include "mc/mc_private.h"\n');
+ fd.write('#include "mc/mc_process.h"\n');
fd.write('#endif\n');
fd.write('\n');
fd.write('XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(simix_popping);\n\n');
fd.write(' */\n');
fd.write('void SIMIX_simcall_handle(smx_simcall_t simcall, int value) {\n');
fd.write(' XBT_DEBUG("Handling simcall %p: %s", simcall, SIMIX_simcall_name(simcall->call));\n');
+ fd.write(' #ifdef HAVE_MC\n');
+ fd.write(' if (mc_model_checker) {\n');
+ fd.write(' MC_invalidate_cache();\n');
+ fd.write(' }\n');
+ fd.write(' #endif\n');
fd.write(' SIMCALL_SET_MC_VALUE(simcall, value);\n');
fd.write(' if (simcall->issuer->context->iwannadie && simcall->call != SIMCALL_PROCESS_CLEANUP)\n');
fd.write(' return;\n');
###
fd = header('popping_bodies.c')
fd.write('#include "smx_private.h"\n')
- fd.write('#include "mc/mc_interface.h"\n')
+ fd.write('#include "mc/mc_forward.h"\n')
fd.write('#include "xbt/ex.h"\n')
handle(fd, Simcall.body, simcalls, simcalls_dict)
fd.close()