#include "mc/mc.h"
#include "src/kernel/activity/CommImpl.hpp"
#include "src/kernel/activity/MutexImpl.hpp"
+#include "src/mc/checker/SimcallInspector.hpp"
#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
simix_global->run_all_actors();
for (smx_actor_t const& process : simix_global->actors_that_ran) {
smx_simcall_t req = &process->simcall;
- if (req->call != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
- SIMIX_simcall_handle(req, 0);
+ if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
+ process->simcall_handle(0);
}
}
#if SIMGRID_HAVE_MC
// Now, we are in the client app, no need for remote memory reading.
smx_simcall_t req = &actor->simcall;
- switch (req->call) {
+ if (req->inspector_ != nullptr)
+ return req->inspector_->is_enabled();
+
+ switch (req->call_) {
case SIMCALL_NONE:
return false;
if (mutex->owner_ == nullptr)
return true;
- return mutex->owner_->get_pid() == req->issuer->get_pid();
+ return mutex->owner_->get_pid() == req->issuer_->get_pid();
}
case SIMCALL_SEM_ACQUIRE: {
xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
#endif
- return req->call == SIMCALL_COMM_ISEND || req->call == SIMCALL_COMM_IRECV || req->call == SIMCALL_COMM_WAIT ||
- req->call == SIMCALL_COMM_WAITANY || req->call == SIMCALL_COMM_TEST || req->call == SIMCALL_COMM_TESTANY ||
- req->call == SIMCALL_MC_RANDOM || req->call == SIMCALL_MUTEX_LOCK || req->call == SIMCALL_MUTEX_TRYLOCK ||
- req->call == SIMCALL_MUTEX_UNLOCK;
+ return (req->inspector_ != nullptr && req->inspector_->is_visible()) || req->call_ == SIMCALL_COMM_ISEND ||
+ req->call_ == SIMCALL_COMM_IRECV || req->call_ == SIMCALL_COMM_WAIT || req->call_ == SIMCALL_COMM_WAITANY ||
+ req->call_ == SIMCALL_COMM_TEST || req->call_ == SIMCALL_COMM_TESTANY || req->call_ == SIMCALL_MC_RANDOM ||
+ req->call_ == SIMCALL_MUTEX_LOCK || req->call_ == SIMCALL_MUTEX_TRYLOCK || req->call_ == SIMCALL_MUTEX_UNLOCK;
}
}
std::uniform_int_distribution<int> prng(min, max);
return prng(rnd_engine);
}
- return simcall->mc_value;
+ return simcall->mc_value_;
}