Merge branch 'master' of scm.gforge.inria.fr:/gitroot/simgrid/simgrid

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

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 630adb9fe81460bbdd8bc1d5e6c612e735ba850d..1b1afcee21eb31ea8bea176fe35d40caa7637b4c 100644 (file)
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -64,8 +64,6 @@ std::vector<double> processes_time;
 simgrid::mc::State* mc_current_state = nullptr;
 char mc_replay_mode = false;
 
-mc_stats_t mc_stats = nullptr;
-
 /* Liveness */
 
 namespace simgrid {
@@ -189,8 +187,8 @@ void replay(std::list<std::unique_ptr<simgrid::mc::State>> const& stack)
     }
 
     /* Update statistics */
-    mc_stats->visited_states++;
-    mc_stats->executed_transitions++;
+    mc_model_checker->visited_states++;
+    mc_model_checker->executed_transitions++;
 
   }
 
@@ -286,40 +284,3 @@ void MC_process_clock_add(smx_process_t process, double amount)
 {
   simgrid::mc::processes_time[process->pid] += amount;
 }
-
-#if HAVE_MC
-void MC_report_assertion_error(void)
-{
-  XBT_INFO("**************************");
-  XBT_INFO("*** PROPERTY NOT VALID ***");
-  XBT_INFO("**************************");
-  XBT_INFO("Counter-example execution trace:");
-  simgrid::mc::dumpRecordPath();
-  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
-    XBT_INFO("%s", s.c_str());
-  simgrid::mc::session->logState();
-}
-
-void MC_report_crash(int status)
-{
-  XBT_INFO("**************************");
-  XBT_INFO("** CRASH IN THE PROGRAM **");
-  XBT_INFO("**************************");
-  if (WIFSIGNALED(status))
-    XBT_INFO("From signal: %s", strsignal(WTERMSIG(status)));
-  else if (WIFEXITED(status))
-    XBT_INFO("From exit: %i", WEXITSTATUS(status));
-  if (WCOREDUMP(status))
-    XBT_INFO("A core dump was generated by the system.");
-  else
-    XBT_INFO("No core dump was generated by the system.");
-  XBT_INFO("Counter-example execution trace:");
-  simgrid::mc::dumpRecordPath();
-  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
-    XBT_INFO("%s", s.c_str());
-  simgrid::mc::session->logState();
-  XBT_INFO("Stack trace:");
-  mc_model_checker->process().dumpStack();
-}
-
-#endif