X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/595e59c568ff5f8510de201bfd800951cdc2adcb..a49a03122b2def71ff741e78d15b38cd1d171184:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index b3140e10d9..0204bbd427 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -12,9 +12,9 @@ #include -#include -#include -#include +#include "xbt/automaton.h" +#include "xbt/dynar.h" +#include "xbt/swag.h" #include "mc_base.h" @@ -29,16 +29,15 @@ #include "src/simix/ActorImpl.hpp" #if SIMGRID_HAVE_MC -#include -#include "src/mc/mc_comm_pattern.h" -#include "src/mc/mc_ignore.h" +#include "src/mc/checker/Checker.hpp" +#include "src/mc/mc_comm_pattern.hpp" +#include "src/mc/mc_private.h" #include "src/mc/mc_request.h" #include "src/mc/mc_safety.h" +#include "src/mc/mc_smx.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/Checker.hpp" +#include #endif #include "src/mc/Transition.hpp" @@ -97,7 +96,7 @@ void MC_run() 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])); - for (auto kv : simix_global->process_list) { + for (auto const& kv : simix_global->process_list) { smx_actor_t actor = kv.second; MC_ignore_heap(&(actor->process_hookup), sizeof(actor->process_hookup)); } @@ -105,13 +104,13 @@ void MC_run() 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(); } @@ -134,7 +133,7 @@ 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;