X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7e2f1b12f4459f77318e5d664317473e35aeb473..d2241d1702d04aa015b098e43d5ebe85071aee69:/src/mc/checker/simgrid_mc.cpp?ds=sidebyside

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index d4916270a3..b3341496a4 100644
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -5,13 +5,15 @@
  * under the terms of the license (GNU LGPL) which comes with this package. */
 
 #include "simgrid/sg_config.hpp"
+#include "src/smpi/include/smpi_config.hpp"
+#include "src/mc/Session.hpp"
 #include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
 
 #include <cstring>
 #include <memory>
-
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
+#include <unistd.h>
 
 static inline
 char** argvdup(int argc, char** argv)
@@ -22,7 +24,7 @@ char** argvdup(int argc, char** argv)
   return argv_copy;
 }
 
-static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session& session)
+static std::unique_ptr<simgrid::mc::Checker> create_checker(simgrid::mc::Session& session)
 {
   if (_sg_mc_comms_determinism || _sg_mc_send_determinism)
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createCommunicationDeterminismChecker(session));
@@ -34,48 +36,36 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session&
 
 int main(int argc, char** argv)
 {
-  using simgrid::mc::Session;
-
-  try {
-    if (argc < 2)
-      xbt_die("Missing arguments.\n");
-
-    // Currently, we need this before sg_config_init:
-    _sg_do_model_check = 1;
+  if (argc < 2)
+    xbt_die("Missing arguments.\n");
 
-    // 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:
-    char** argv_copy = argvdup(argc, argv);
-    xbt_log_init(&argc, argv);
-    sg_config_init(&argc, argv);
+  // Currently, we need this before sg_config_init:
+  _sg_do_model_check = 1;
 
-    std::unique_ptr<Session> session =
-      std::unique_ptr<Session>(Session::spawnvp(argv_copy[1], argv_copy+1));
-    delete[] argv_copy;
+  // 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:
+  char** argv_copy = argvdup(argc, argv);
+  xbt_log_init(&argc, argv);
+#ifdef HAVE_SMPI
+  smpi_init_options();//only performed once
+#endif
+  sg_config_init(&argc, argv);
+  simgrid::mc::session = new simgrid::mc::Session([argv_copy] { execvp(argv_copy[1], argv_copy + 1); });
+  delete[] argv_copy;
 
-    simgrid::mc::session = session.get();
-    std::unique_ptr<simgrid::mc::Checker> checker = createChecker(*session);
-    int res = SIMGRID_MC_EXIT_SUCCESS;
-    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;
-    }
-    checker = nullptr;
-    session->close();
-    return res;
-  }
-  catch(std::exception& e) {
-    XBT_ERROR("Exception: %s", e.what());
-    return SIMGRID_MC_EXIT_ERROR;
-  }
-  catch(...) {
-    XBT_ERROR("Unknown exception");
-    return SIMGRID_MC_EXIT_ERROR;
+  std::unique_ptr<simgrid::mc::Checker> checker = create_checker(*simgrid::mc::session);
+  int res                                       = SIMGRID_MC_EXIT_SUCCESS;
+  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;
   }
+  checker = nullptr;
+  simgrid::mc::session->close();
+  return res;
 }