X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdde4c97ef4a5c90e301b76c52da159005e43b55..172a73b13fe909117c7fbf3d69d4ce5e87efdbc6:/src/mc/mc_global.cpp

diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp
index 56fbbb3cb8..0e86c470ec 100644
--- a/src/mc/mc_global.cpp
+++ b/src/mc/mc_global.cpp
@@ -1,5 +1,4 @@
-/* Copyright (c) 2008-2015. The SimGrid Team.
- * All rights reserved.                                                     */
+/* Copyright (c) 2008-2017. 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. */
@@ -13,9 +12,9 @@
 
 #include <vector>
 
-#include <xbt/dynar.h>
-#include <xbt/automaton.h>
-#include <xbt/swag.h>
+#include "xbt/automaton.h"
+#include "xbt/dynar.h"
+#include "xbt/swag.h"
 
 #include "mc_base.h"
 
@@ -27,29 +26,27 @@
 #include <sys/time.h>
 #endif
 
-#include "src/simix/smx_process_private.h"
-
-#if HAVE_MC
+#include "src/simix/ActorImpl.hpp"
+
+#if SIMGRID_HAVE_MC
+#include "src/mc/checker/Checker.hpp"
+#include "src/mc/mc_comm_pattern.hpp"
+#include "src/mc/mc_private.hpp"
+#include "src/mc/mc_request.hpp"
+#include "src/mc/mc_safety.hpp"
+#include "src/mc/mc_smx.hpp"
+#include "src/mc/mc_snapshot.hpp"
+#include "src/mc/mc_unw.hpp"
 #include <libunwind.h>
-#include "src/mc/mc_comm_pattern.h"
-#include "src/mc/mc_request.h"
-#include "src/mc/mc_safety.h"
-#include "src/mc/mc_snapshot.h"
-#include "src/mc/mc_private.h"
-#include "src/mc/mc_unw.h"
-#include "src/mc/mc_smx.h"
-#include "src/mc/Checker.hpp"
 #endif
 
-#include "src/mc/mc_record.h"
-#include "src/mc/mc_protocol.h"
-#include "src/mc/Client.hpp"
 #include "src/mc/Transition.hpp"
+#include "src/mc/mc_record.hpp"
+#include "src/mc/remote/Client.hpp"
+#include "src/mc/remote/mc_protocol.h"
 
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc, "Logging specific to MC (global)");
 
-e_mc_mode_t mc_mode;
-
 namespace simgrid {
 namespace mc {
 
@@ -58,11 +55,7 @@ std::vector<double> processes_time;
 }
 }
 
-#if HAVE_MC
-
-/* MC global data structures */
-simgrid::mc::State* mc_current_state = nullptr;
-char mc_replay_mode = false;
+#if SIMGRID_HAVE_MC
 
 /* Liveness */
 
@@ -78,7 +71,7 @@ xbt_automaton_t property_automaton = nullptr;
 FILE *dot_output = nullptr;
 
 
-/*******************************  Initialisation of MC *******************************/
+/*******************************  Initialization of MC *******************************/
 /*********************************************************************************/
 
 void MC_init_dot_output()
@@ -100,23 +93,24 @@ void MC_init_dot_output()
 
 void MC_run()
 {
-  simgrid::mc::processes_time.resize(simix_process_maxpid);
+  simgrid::mc::processes_time.resize(SIMIX_process_get_maxpid());
   MC_ignore_heap(simgrid::mc::processes_time.data(),
     simgrid::mc::processes_time.size() * sizeof(simgrid::mc::processes_time[0]));
-  smx_process_t process;
-  xbt_swag_foreach(process, simix_global->process_list)
-    MC_ignore_heap(&(process->process_hookup), sizeof(process->process_hookup));
+  for (auto const& kv : simix_global->process_list) {
+    smx_actor_t actor = kv.second;
+    MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup));
+  }
   simgrid::mc::Client::get()->mainLoop();
   simgrid::mc::processes_time.clear();
 }
 
-void MC_show_deadlock(void)
+void MC_show_deadlock()
 {
   XBT_INFO("**************************");
   XBT_INFO("*** DEAD-LOCK DETECTED ***");
   XBT_INFO("**************************");
   XBT_INFO("Counter-example execution trace:");
-  for (auto& s : mc_model_checker->getChecker()->getTextualTrace())
+  for (auto const& s : mc_model_checker->getChecker()->getTextualTrace())
     XBT_INFO("%s", s.c_str());
   simgrid::mc::session->logState();
 }
@@ -139,11 +133,11 @@ void dumpStack(FILE* file, unw_cursor_t cursor)
 
   unw_word_t off;
   do {
-    const char * name = !unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
+    const char* name = not unw_get_proc_name(&cursor, buffer, 100, &off) ? buffer : "?";
 
     int status;
 
-    // Demangle C++ names:
+    // Unmangle C++ names:
     char* realname = abi::__cxa_demangle(name, 0, 0, &status);
 
 #if defined(__x86_64__)
@@ -173,7 +167,7 @@ static void MC_dump_stacks(FILE* file)
 
     simgrid::mc::UnwindContext context;
     unw_context_t raw_context =
-      mc_model_checker->process().read<unw_context_t>(
+      (unw_context_t) mc_model_checker->process().read<unw_context_t>(
         simgrid::mc::remote((unw_context_t *)stack.context));
     context.initialize(&mc_model_checker->process(), &raw_context);
 
@@ -183,7 +177,7 @@ static void MC_dump_stacks(FILE* file)
 }
 #endif
 
-double MC_process_clock_get(smx_process_t process)
+double MC_process_clock_get(smx_actor_t process)
 {
   if (simgrid::mc::processes_time.empty())
     return 0;
@@ -192,7 +186,7 @@ double MC_process_clock_get(smx_process_t process)
   return -1;
 }
 
-void MC_process_clock_add(smx_process_t process, double amount)
+void MC_process_clock_add(smx_actor_t process, double amount)
 {
   simgrid::mc::processes_time[process->pid] += amount;
 }