X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/6a740731c81fb23ebbb5791f61dacb02c751bcc4..b060185506092d4d37bc605840b8e7f028cc81ab:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index d3b1935d91..fcb4fa08e5 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -11,11 +11,12 @@
 #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
@@ -42,14 +43,14 @@ void wait_for_requests()
   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
   xbt_dynar_reset(simix_global->actors_vector);
-  for (std::pair<aid_t, smx_actor_t> const& kv : simix_global->process_list) {
+  for (std::pair<const aid_t, smx_actor_t> const& kv : simix_global->process_list) {
     xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, kv.second);
   }
 #endif
@@ -72,12 +73,12 @@ bool actor_is_enabled(smx_actor_t actor)
 #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();
@@ -166,9 +167,8 @@ bool request_is_visible(const s_smx_simcall* req)
 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_;
 }