#include "src/mc/mc_replay.hpp"
#include "src/simix/smx_private.hpp"
-#include <random>
+#include "xbt/random.hpp"
#if SIMGRID_HAVE_MC
#include "src/mc/ModelChecker.hpp"
-#include "src/mc/remote/RemoteClient.hpp"
+#include "src/mc/Session.hpp"
+#include "src/mc/remote/RemoteSimulation.hpp"
using simgrid::mc::remote;
#endif
while (not simix_global->actors_to_run.empty()) {
simix_global->run_all_actors();
for (smx_actor_t const& process : simix_global->actors_that_ran) {
- const s_smx_simcall* req = &process->simcall;
+ const s_smx_simcall* req = &process->simcall_;
if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
process->simcall_handle(0);
}
#if SIMGRID_HAVE_MC
// If in the MCer, ask the client app since it has all the data
if (mc_model_checker != nullptr) {
- return mc_model_checker->process().actor_is_enabled(actor->get_pid());
+ return simgrid::mc::session->actor_is_enabled(actor->get_pid());
}
#endif
// Now, we are in the client app, no need for remote memory reading.
- smx_simcall_t req = &actor->simcall;
+ smx_simcall_t req = &actor->simcall_;
if (req->inspector_ != nullptr)
return req->inspector_->is_enabled();
case SIMCALL_COMM_WAIT: {
/* FIXME: check also that src and dst processes are not suspended */
- const kernel::activity::CommImpl* act =
- static_cast<kernel::activity::CommImpl*>(simcall_comm_wait__getraw__comm(req));
+ const kernel::activity::CommImpl* act = simcall_comm_wait__getraw__comm(req);
if (act->src_timeout_ || act->dst_timeout_) {
/* If it has a timeout it will be always be enabled (regardless of who declared the timeout),
int simcall_HANDLER_mc_random(smx_simcall_t simcall, int min, int max)
{
if (not MC_is_active() && MC_record_path.empty()) {
- static std::default_random_engine rnd_engine;
- std::uniform_int_distribution<int> prng(min, max);
- return prng(rnd_engine);
+ static simgrid::xbt::random::XbtRandom prng;
+ return prng.uniform_int(min, max);
}
return simcall->mc_value_;
}