X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4fa75dd8262ed5c51d5c3219d38235976758889f..1eb2acd21f33865e5a3b27b5ec3e91a6ccc17ff1:/src/mc/mc_global.cpp diff --git a/src/mc/mc_global.cpp b/src/mc/mc_global.cpp index 8733d7692d..76a2af2cfa 100644 --- a/src/mc/mc_global.cpp +++ b/src/mc/mc_global.cpp @@ -20,8 +20,8 @@ #endif #include "simgrid/sg_config.h" -#include "../surf/surf_private.h" -#include "../simix/smx_private.h" +#include "src/surf/surf_private.h" +#include "src/simix/smx_private.h" #include "xbt/fifo.h" #include "xbt/automaton.h" #include "xbt/dict.h" @@ -30,21 +30,20 @@ #ifdef HAVE_MC #include #include -#include "../xbt/mmalloc/mmprivate.h" -#include "mc_object_info.h" -#include "mc_comm_pattern.h" -#include "mc_request.h" -#include "mc_safety.h" -#include "mc_snapshot.h" -#include "mc_liveness.h" -#include "mc_private.h" -#include "mc_unw.h" -#include "mc_smx.h" -#include "mcer_ignore.h" +#include "src/xbt/mmalloc/mmprivate.h" +#include "src/mc/mc_object_info.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_liveness.h" +#include "src/mc/mc_private.h" +#include "src/mc/mc_unw.h" +#include "src/mc/mc_smx.h" #endif -#include "mc_record.h" -#include "mc_protocol.h" -#include "mc_client.h" +#include "src/mc/mc_record.h" +#include "src/mc/mc_protocol.h" +#include "src/mc/mc_client.h" extern "C" { @@ -479,13 +478,13 @@ void MC_automaton_load(const char *file) } // TODO, fix cross-process access (this function is not used) -void MC_dump_stacks(FILE* file) +static void MC_dump_stacks(FILE* file) { int nstack = 0; - stack_region_t current_stack; - unsigned cursor; - xbt_dynar_foreach(stacks_areas, cursor, current_stack) { - unw_context_t * context = (unw_context_t *)current_stack->context; + for (auto const& stack : mc_model_checker->process().stack_areas()) { + + xbt_die("Fix cross-process access to the context"); + unw_context_t * context = (unw_context_t *)stack.context; fprintf(file, "Stack %i:\n", nstack); int nframe = 0;