X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/055f70fa5c9473b92721b4872fdcdb17857bb2b1..a45a65d79c6316b4bf515722f53d85a7080eeeb6:/src/mc/checker/simgrid_mc.cpp

diff --git a/src/mc/checker/simgrid_mc.cpp b/src/mc/checker/simgrid_mc.cpp
index af02035c7c..f7b5a613da 100644
--- a/src/mc/checker/simgrid_mc.cpp
+++ b/src/mc/checker/simgrid_mc.cpp
@@ -1,35 +1,19 @@
-/* Copyright (c) 2015-2018. The SimGrid Team.
+/* Copyright (c) 2015-2019. 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 <exception>
-
-#include <cstdlib>
-#include <cstdio>
-#include <cstring>
-
-#include <utility>
-
-#include <unistd.h>
-
-#include <xbt/log.h>
-
-#include "simgrid/sg_config.h"
-#include "src/xbt_modinter.h"
-
+#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_base.h"
-#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_config.hpp"
 #include "src/mc/mc_exit.hpp"
-#include "src/mc/mc_private.hpp"
-#include "src/mc/mc_safety.hpp"
-#include "src/mc/remote/mc_protocol.h"
 
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_main, mc, "Entry point for simgrid-mc");
-extern std::string _sg_mc_property_file;
+#include <cstring>
+#include <memory>
+#include <unistd.h>
 
 static inline
 char** argvdup(int argc, char** argv)
@@ -40,11 +24,11 @@ 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));
-  else if (_sg_mc_property_file.empty())
+  else if (_sg_mc_property_file.get().empty())
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createSafetyChecker(session));
   else
     return std::unique_ptr<simgrid::mc::Checker>(simgrid::mc::createLivenessChecker(session));
@@ -52,48 +36,34 @@ static std::unique_ptr<simgrid::mc::Checker> createChecker(simgrid::mc::Session&
 
 int main(int argc, char** argv)
 {
-  using simgrid::mc::Session;
-
+  if (argc < 2)
+    xbt_die("Missing arguments.\n");
+
+  // Currently, we need this before sg_config_init:
+  _sg_do_model_check = 1;
+
+  // 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);
+  smpi_init_options();//only performed once
+  sg_config_init(&argc, argv);
+  simgrid::mc::session = new simgrid::mc::Session([argv_copy] { execvp(argv_copy[1], argv_copy + 1); });
+  delete[] argv_copy;
+
+  std::unique_ptr<simgrid::mc::Checker> checker = create_checker(*simgrid::mc::session);
+  int res                                       = SIMGRID_MC_EXIT_SUCCESS;
   try {
-    if (argc < 2)
-      xbt_die("Missing arguments.\n");
-
-    // Currently, we need this before sg_config_init:
-    _sg_do_model_check = 1;
-
-    // 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);
-
-    std::unique_ptr<Session> session =
-      std::unique_ptr<Session>(Session::spawnvp(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 (simgrid::mc::DeadlockError& de) {
-      res = SIMGRID_MC_EXIT_DEADLOCK;
-    } catch (simgrid::mc::TerminationError& te) {
-      res = SIMGRID_MC_EXIT_NON_TERMINATION;
-    } catch (simgrid::mc::LivenessError& le) {
-      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;
+    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;
 }