int MC_random(int min, int max)
{
- xbt_assert(mc_mode != MC_MODE_SERVER);
+#if HAVE_MC
+ xbt_assert(mc_model_checker == nullptr);
/* TODO, if the MC is disabled we do not really need to make a simcall for
* this :) */
- /* FIXME: return mc_current_state->executed_transition->random.value; */
+#endif
return simcall_mc_random(min, max);
}
void wait_for_requests(void)
{
- assert(mc_mode != MC_MODE_SERVER);
+#if HAVE_MC
+ xbt_assert(mc_model_checker == nullptr);
+#endif
smx_process_t process;
smx_simcall_t req;
#if HAVE_MC
// Fetch from MCed memory:
- if (mc_mode == MC_MODE_SERVER) {
+ if (mc_model_checker != nullptr) {
mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
}
s_xbt_dynar_t comms_buffer;
size_t buffer_size = 0;
- if (mc_mode == MC_MODE_SERVER) {
+ if (mc_model_checker != nullptr) {
// Read dynar:
mc_model_checker->process().read(
&comms_buffer, remote(simcall_comm_waitany__get__comms(req)));
// Read all the dynar buffer:
char buffer[buffer_size];
- if (mc_mode == MC_MODE_SERVER)
+ if (mc_model_checker != nullptr)
mc_model_checker->process().read_bytes(buffer, sizeof(buffer),
remote(comms->data));
#else
for (index = 0; index < comms->used; ++index) {
#if HAVE_MC
// Fetch act from MCed memory:
- if (mc_mode == MC_MODE_SERVER) {
+ if (mc_model_checker != nullptr) {
memcpy(&act, buffer + comms->elmsize * index, sizeof(act));
mc_model_checker->process().read(&temp_synchro, remote(act));
act = &temp_synchro;
smx_mutex_t mutex = simcall_mutex_lock__get__mutex(req);
#if HAVE_MC
s_smx_mutex_t temp_mutex;
- if (mc_mode == MC_MODE_SERVER) {
+ if (mc_model_checker != nullptr) {
mc_model_checker->process().read(&temp_mutex, remote(mutex));
mutex = &temp_mutex;
}
#endif
+
if(mutex->owner == nullptr)
return true;
- else
#if HAVE_MC
+ else if (mc_model_checker != nullptr) {
+ simgrid::mc::Process& modelchecked = mc_model_checker->process();
// TODO, *(mutex->owner) :/
- return MC_smx_resolve_process(mutex->owner)->pid ==
- MC_smx_resolve_process(req->issuer)->pid;
-#else
- return mutex->owner->pid == req->issuer->pid;
+ return modelchecked.resolveProcess(simgrid::mc::remote(mutex->owner))->pid
+ == modelchecked.resolveProcess(simgrid::mc::remote(req->issuer))->pid;
+ }
#endif
+ else
+ return mutex->owner->pid == req->issuer->pid;
}
default: