X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/149c63f36e15b8500b1e826bda5138318ff7ba2b..c6c7e9aaac3b743f24a2be104fa027645a20217a:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index b76dc7c3af..ab35bd1765 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,8 +43,8 @@ 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;
-      if (req->call_ != SIMCALL_NONE && not simgrid::mc::request_is_visible(req))
+      const s_smx_simcall* req = &process->simcall_;
+      if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req))
         process->simcall_handle(0);
     }
   }
@@ -69,27 +70,29 @@ void wait_for_requests()
 // Called from both MCer and MCed:
 bool actor_is_enabled(smx_actor_t actor)
 {
+// #del
 #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();
 
+  using simix::Simcall;
   switch (req->call_) {
-    case SIMCALL_NONE:
+    case Simcall::NONE:
       return false;
 
-    case SIMCALL_COMM_WAIT: {
+    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),
@@ -104,7 +107,7 @@ bool actor_is_enabled(smx_actor_t actor)
       return (act->src_actor_ && act->dst_actor_);
     }
 
-    case SIMCALL_COMM_WAITANY: {
+    case Simcall::COMM_WAITANY: {
       simgrid::kernel::activity::CommImpl** comms = simcall_comm_waitany__get__comms(req);
       size_t count                                = simcall_comm_waitany__get__count(req);
       for (unsigned int index = 0; index < count; ++index) {
@@ -115,7 +118,7 @@ bool actor_is_enabled(smx_actor_t actor)
       return false;
     }
 
-    case SIMCALL_MUTEX_LOCK: {
+    case Simcall::MUTEX_LOCK: {
       const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
 
       if (mutex->get_owner() == nullptr)
@@ -123,7 +126,7 @@ bool actor_is_enabled(smx_actor_t actor)
       return mutex->get_owner()->get_pid() == req->issuer_->get_pid();
     }
 
-    case SIMCALL_SEM_ACQUIRE: {
+    case Simcall::SEM_ACQUIRE: {
       static int warned = 0;
       if (not warned)
         XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
@@ -131,7 +134,7 @@ bool actor_is_enabled(smx_actor_t actor)
       return true;
     }
 
-    case SIMCALL_COND_WAIT: {
+    case Simcall::COND_WAIT: {
       static int warned = 0;
       if (not warned)
         XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
@@ -154,10 +157,12 @@ bool request_is_visible(const s_smx_simcall* req)
   xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
 #endif
 
-  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;
+  using simix::Simcall;
+  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;
 }
 
 }
@@ -166,9 +171,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_;
 }