Merge mc_safety.hpp into DFSExplorer class

[simgrid.git] / src / mc / explo / simgrid_mc.cpp

diff --git a/src/mc/explo/simgrid_mc.cpp b/src/mc/explo/simgrid_mc.cpp
index 8da0002..d540f2a 100644 (file)
--- a/src/mc/explo/simgrid_mc.cpp
+++ b/src/mc/explo/simgrid_mc.cpp
@@ -4,7 +4,6 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/sg_config.hpp"
-#include "src/internal_config.h"
 #include "src/mc/explo/Exploration.hpp"
 #include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
@@ -13,19 +12,9 @@
 #include "smpi/smpi.h"
 #endif
 
-#include <cstring>
-#include <memory>
-#include <unistd.h>
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc);
 
-using api = simgrid::mc::Api;
-
-static inline char** argvdup(int argc, char** argv)
-{
-  auto* argv_copy = new char*[argc + 1];
-  std::memcpy(argv_copy, argv, sizeof(char*) * argc);
-  argv_copy[argc] = nullptr;
-  return argv_copy;
-}
+using namespace simgrid::mc;
 
 int main(int argc, char** argv)
 {
@@ -36,37 +25,33 @@ int main(int argc, char** argv)
 
   // The initialization function can touch argv.
   // We make a copy of argv before modifying it in order to pass the original value to the model-checked application:
-  char** argv_copy = argvdup(argc, argv);
+  std::vector<char*> argv_copy{argv, argv + argc + 1};
 
   xbt_log_init(&argc, argv);
 #if HAVE_SMPI
-  smpi_init_options(); // only performed once
+  smpi_init_options(); // that's OK to call it twice, and we need it ASAP
 #endif
   sg_config_init(&argc, argv);
 
-  simgrid::mc::CheckerAlgorithm algo;
+  std::unique_ptr<Exploration> explo;
+
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
-    algo = simgrid::mc::CheckerAlgorithm::CommDeterminism;
+    explo = std::unique_ptr<Exploration>(create_communication_determinism_checker(argv_copy, cfg_use_DPOR()));
   else if (_sg_mc_unfolding_checker)
-    algo = simgrid::mc::CheckerAlgorithm::UDPOR;
+    explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
   else if (_sg_mc_property_file.get().empty())
-    algo = simgrid::mc::CheckerAlgorithm::Safety;
+    explo = std::unique_ptr<Exploration>(create_dfs_exploration(argv_copy, cfg_use_DPOR()));
   else
-    algo = simgrid::mc::CheckerAlgorithm::Liveness;
+    explo = std::unique_ptr<Exploration>(create_liveness_checker(argv_copy));
 
-  int res      = SIMGRID_MC_EXIT_SUCCESS;
-  auto checker = api::get().initialize(argv_copy, algo);
   try {
-    checker->run();
-  } catch (const simgrid::mc::DeadlockError&) {
-    res = SIMGRID_MC_EXIT_DEADLOCK;
-  } catch (const simgrid::mc::TerminationError&) {
-    res = SIMGRID_MC_EXIT_NON_TERMINATION;
-  } catch (const simgrid::mc::LivenessError&) {
-    res = SIMGRID_MC_EXIT_LIVENESS;
+    explo->run();
+  } catch (const DeadlockError&) {
+    return SIMGRID_MC_EXIT_DEADLOCK;
+  } catch (const TerminationError&) {
+    return SIMGRID_MC_EXIT_NON_TERMINATION;
+  } catch (const LivenessError&) {
+    return SIMGRID_MC_EXIT_LIVENESS;
   }
-  api::get().s_close();
-  delete[] argv_copy;
-  // delete checker; SEGFAULT in liveness
-  return res;
+  return SIMGRID_MC_EXIT_SUCCESS;
 }