X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c5f1df636e530701757614bc6a3b4e1c963598b4..c5d588d76539d285fb67bef1ab477191622b94a9:/src/mc/mc_base.cpp

diff --git a/src/mc/mc_base.cpp b/src/mc/mc_base.cpp
index 3788cd4d7f..eaaf235c84 100644
--- a/src/mc/mc_base.cpp
+++ b/src/mc/mc_base.cpp
@@ -3,21 +3,21 @@
 /* This program is free software; you can redistribute it and/or modify it
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
-#include "src/mc/mc_base.h"
+#include "src/mc/mc_base.hpp"
 #include "mc/mc.h"
+#include "src/kernel/EngineImpl.hpp"
 #include "src/kernel/activity/CommImpl.hpp"
 #include "src/kernel/activity/MutexImpl.hpp"
-#include "src/mc/checker/SimcallInspector.hpp"
+#include "src/kernel/actor/SimcallObserver.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_replay.hpp"
-#include "src/simix/smx_private.hpp"
 
 #include "xbt/random.hpp"
 
 #if SIMGRID_HAVE_MC
 #include "src/mc/ModelChecker.hpp"
 #include "src/mc/Session.hpp"
-#include "src/mc/remote/RemoteSimulation.hpp"
+#include "src/mc/remote/RemoteProcess.hpp"
 
 using simgrid::mc::remote;
 #endif
@@ -33,33 +33,34 @@ int MC_random(int min, int max)
     static simgrid::xbt::random::XbtRandom prng;
     return prng.uniform_int(min, max);
   }
-  auto observer = new simgrid::mc::RandomSimcall(SIMIX_process_self(), min, max);
-  return simgrid::kernel::actor::simcall([observer] { return observer->get_value(); }, observer);
+  simgrid::kernel::actor::RandomSimcall observer{simgrid::kernel::actor::ActorImpl::self(), min, max};
+  return simgrid::kernel::actor::simcall([&observer] { return observer.get_value(); }, &observer);
 }
 
 namespace simgrid {
 namespace mc {
 
-void wait_for_requests()
+void execute_actors()
 {
+  auto* engine = kernel::EngineImpl::get_instance();
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr, "This must be called from the client");
 #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_;
+  while (engine->has_actors_to_run()) {
+    engine->run_all_actors();
+    for (auto const& actor : engine->get_actors_that_ran()) {
+      const s_smx_simcall* req = &actor->simcall_;
       if (req->call_ != simix::Simcall::NONE && not simgrid::mc::request_is_visible(req))
-        process->simcall_handle(0);
+        actor->simcall_handle(0);
     }
   }
 #if SIMGRID_HAVE_MC
-  xbt_dynar_reset(simix_global->actors_vector);
-  for (std::pair<const aid_t, smx_actor_t> const& kv : simix_global->process_list) {
+  engine->reset_actor_dynar();
+  for (auto const& kv : engine->get_actor_list()) {
     auto actor = kv.second;
-    if (actor->simcall_.inspector_ != nullptr)
-      actor->simcall_.mc_max_consider_ = actor->simcall_.inspector_->get_max_consider();
-    xbt_dynar_push_as(simix_global->actors_vector, smx_actor_t, actor);
+    if (actor->simcall_.observer_ != nullptr)
+      actor->simcall_.mc_max_consider_ = actor->simcall_.observer_->get_max_consider();
+    engine->add_actor_to_dynar(actor);
   }
 #endif
 }
@@ -82,7 +83,7 @@ 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 simgrid::mc::session->actor_is_enabled(actor->get_pid());
+    return simgrid::mc::session_singleton->actor_is_enabled(actor->get_pid());
   }
 #endif
 // #
@@ -90,8 +91,8 @@ bool actor_is_enabled(smx_actor_t actor)
   // Now, we are in the client app, no need for remote memory reading.
   smx_simcall_t req = &actor->simcall_;
 
-  if (req->inspector_ != nullptr)
-    return req->inspector_->is_enabled();
+  if (req->observer_ != nullptr)
+    return req->observer_->is_enabled();
 
   using simix::Simcall;
   switch (req->call_) {
@@ -125,30 +126,6 @@ bool actor_is_enabled(smx_actor_t actor)
       return false;
     }
 
-    case Simcall::MUTEX_LOCK: {
-      const kernel::activity::MutexImpl* mutex = simcall_mutex_lock__get__mutex(req);
-
-      if (mutex->get_owner() == nullptr)
-        return true;
-      return mutex->get_owner()->get_pid() == req->issuer_->get_pid();
-    }
-
-    case Simcall::SEM_ACQUIRE: {
-      static bool warned = false;
-      if (not warned)
-        XBT_INFO("Using semaphore in model-checked code is still experimental. Use at your own risk");
-      warned = true;
-      return true;
-    }
-
-    case Simcall::COND_WAIT: {
-      static bool warned = false;
-      if (not warned)
-        XBT_INFO("Using condition variables in model-checked code is still experimental. Use at your own risk");
-      warned = true;
-      return true;
-    }
-
     default:
       /* The rest of the requests are always enabled */
       return true;
@@ -163,14 +140,12 @@ bool request_is_visible(const s_smx_simcall* req)
 #if SIMGRID_HAVE_MC
   xbt_assert(mc_model_checker == nullptr, "This should be called from the client side");
 #endif
-  if (req->inspector_ != nullptr)
-    return req->inspector_->is_visible();
+  if (req->observer_ != nullptr)
+    return req->observer_->is_visible();
 
   using simix::Simcall;
   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::MUTEX_LOCK ||
-         req->call_ == Simcall::MUTEX_TRYLOCK || req->call_ == Simcall::MUTEX_UNLOCK;
+         req->call_ == Simcall::COMM_WAITANY || req->call_ == Simcall::COMM_TEST || req->call_ == Simcall::COMM_TESTANY;
 }
 
 }