X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/736cc9af8941a0a0649d50da814be296c6ab269b..7e625e5e848a284b522d69ec28cb111f1f88515b:/src/mc/explo/simgrid_mc.cpp

diff --git a/src/mc/explo/simgrid_mc.cpp b/src/mc/explo/simgrid_mc.cpp
index 6d47450e0f..51871357ee 100644
--- a/src/mc/explo/simgrid_mc.cpp
+++ b/src/mc/explo/simgrid_mc.cpp
@@ -1,28 +1,27 @@
-/* Copyright (c) 2015-2022. The SimGrid Team. All rights reserved.          */
+/* Copyright (c) 2015-2023. The SimGrid Team. All rights reserved.          */
 
 /* 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 "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"
+#include "src/simgrid/sg_config.hpp"
 
 #if HAVE_SMPI
 #include "smpi/smpi.h"
 #endif
 
-#include <cstring>
-#include <memory>
-#include <unistd.h>
+XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(mc);
+
+using namespace simgrid::mc;
 
 int main(int argc, char** argv)
 {
   xbt_assert(argc >= 2, "Missing arguments");
 
   // Currently, we need this before sg_config_init:
-  _sg_do_model_check = 1;
+  simgrid::mc::set_model_checking_mode(simgrid::mc::ModelCheckingMode::CHECKER_SIDE);
 
   // 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:
@@ -30,32 +29,26 @@ int main(int argc, char** argv)
 
   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, get_model_checking_reduction()));
   else if (_sg_mc_unfolding_checker)
-    algo = simgrid::mc::CheckerAlgorithm::UDPOR;
-  else if (_sg_mc_property_file.get().empty())
-    algo = simgrid::mc::CheckerAlgorithm::Safety;
+    explo = std::unique_ptr<Exploration>(create_udpor_checker(argv_copy));
   else
-    algo = simgrid::mc::CheckerAlgorithm::Liveness;
+    explo = std::unique_ptr<Exploration>(create_dfs_exploration(argv_copy, get_model_checking_reduction()));
 
-  int res      = SIMGRID_MC_EXIT_SUCCESS;
-  std::unique_ptr<simgrid::mc::Exploration> checker{simgrid::mc::Api::get().initialize(argv_copy.data(), algo)};
+  ExitStatus status;
   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();
+    status = ExitStatus::SUCCESS;
+  } catch (const McError& e) {
+    status = e.value;
   }
-  simgrid::mc::Api::get().s_close();
-  checker.release(); // FIXME: this line should not exist, but it segfaults in liveness
-  return res;
+  return static_cast<int>(status);
 }