Don't have an extra actor in s4u-synchro-mutex to create the others

[simgrid.git] / src / mc / api.cpp

diff --git a/src/mc/api.cpp b/src/mc/api.cpp
index 450b95a..a953919 100644 (file)
--- a/src/mc/api.cpp
+++ b/src/mc/api.cpp
@@ -28,29 +28,12 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(Api, mc, "Logging specific to MC Facade APIs ");
 XBT_LOG_EXTERNAL_CATEGORY(mc_global);
 
-using Simcall = simgrid::simix::Simcall;
-
 namespace simgrid {
 namespace mc {
 
-/** Statically "upcast" a s_smx_actor_t into an ActorInformation
- *
- *  This gets 'actorInfo' from '&actorInfo->copy'. It upcasts in the
- *  sense that we could achieve the same thing by having ActorInformation
- *  inherit from s_smx_actor_t but we don't really want to do that.
- */
-static simgrid::mc::ActorInformation* actor_info_cast(smx_actor_t actor)
-{
-  simgrid::mc::ActorInformation temp;
-  std::size_t offset = (char*)temp.copy.get_buffer() - (char*)&temp;
-
-  auto* process_info = reinterpret_cast<simgrid::mc::ActorInformation*>((char*)actor - offset);
-  return process_info;
-}
-
-simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::CheckerAlgorithm algo) const
+simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::ExplorationAlgorithm algo)
 {
-  simgrid::mc::session_singleton = std::make_unique<simgrid::mc::Session>([argv] {
+  session_ = std::make_unique<simgrid::mc::Session>([argv] {
     int i = 1;
     while (argv[i] != nullptr && argv[i][0] == '-')
       i++;
@@ -62,20 +45,20 @@ simgrid::mc::Exploration* Api::initialize(char** argv, simgrid::mc::CheckerAlgor
 
   simgrid::mc::Exploration* explo;
   switch (algo) {
-    case CheckerAlgorithm::CommDeterminism:
-      explo = simgrid::mc::create_communication_determinism_checker(session_singleton.get());
+    case ExplorationAlgorithm::CommDeterminism:
+      explo = simgrid::mc::create_communication_determinism_checker(session_.get());
       break;
 
-    case CheckerAlgorithm::UDPOR:
-      explo = simgrid::mc::create_udpor_checker(session_singleton.get());
+    case ExplorationAlgorithm::UDPOR:
+      explo = simgrid::mc::create_udpor_checker(session_.get());
       break;
 
-    case CheckerAlgorithm::Safety:
-      explo = simgrid::mc::create_safety_checker(session_singleton.get());
+    case ExplorationAlgorithm::Safety:
+      explo = simgrid::mc::create_dfs_exploration(session_.get());
       break;
 
-    case CheckerAlgorithm::Liveness:
-      explo = simgrid::mc::create_liveness_checker(session_singleton.get());
+    case ExplorationAlgorithm::Liveness:
+      explo = simgrid::mc::create_liveness_checker(session_.get());
       break;
 
     default:
@@ -134,10 +117,9 @@ simgrid::mc::Snapshot* Api::take_snapshot(long num_state) const
   return snapshot;
 }
 
-void Api::s_close() const
+void Api::s_close()
 {
-  session_singleton->close();
-  session_singleton.reset();
+  session_.reset();
   if (simgrid::mc::property_automaton != nullptr) {
     xbt_automaton_free(simgrid::mc::property_automaton);
     simgrid::mc::property_automaton = nullptr;