X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c0dc66a3644be860680e6df4092484c522e59d40..ab23fd586c00bc3e9ea24f1dcd3d52dd0fc60bce:/src/mc/mc_global.c diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c index 1af07a96cc..bee23e103c 100644 --- a/src/mc/mc_global.c +++ b/src/mc/mc_global.c @@ -59,6 +59,7 @@ mc_state_t mc_current_state = NULL; char mc_replay_mode = FALSE; double *mc_time = NULL; mc_snapshot_t initial_snapshot = NULL; +int raw_mem_set; /* Safety */ @@ -70,6 +71,7 @@ mc_stats_t mc_stats = NULL; mc_stats_pair_t mc_stats_pair = NULL; xbt_fifo_t mc_stack_liveness = NULL; mc_snapshot_t initial_snapshot_liveness = NULL; +int compare; xbt_automaton_t _mc_property_automaton = NULL; @@ -130,6 +132,7 @@ void MC_init_safety(void) MC_take_snapshot(initial_snapshot); MC_UNSET_RAW_MEM; + if(raw_mem_set) MC_SET_RAW_MEM; else @@ -137,6 +140,10 @@ void MC_init_safety(void) } +void MC_compare(void){ + compare = 1; +} + void MC_modelcheck(void) { @@ -154,6 +161,8 @@ void MC_modelcheck_liveness(){ mc_time = xbt_new0(double, simix_process_maxpid); + compare = 0; + /* Initialize the data structures that must be persistent across every iteration of the model-checker (in RAW memory) */ @@ -584,38 +593,6 @@ double MC_process_clock_get(smx_process_t process) return 0; } -void MC_diff(void){ - - mc_snapshot_t sn = xbt_new0(s_mc_snapshot_t, 1); - MC_take_snapshot_liveness(sn); - - int i; - - XBT_INFO("Number of regions : %u", sn->num_reg); - - for(i=0; inum_reg; i++){ - - switch(sn->regions[i]->type){ - case 0: /* heap */ - XBT_INFO("Size of heap : %zu", sn->regions[i]->size); - mmalloc_display_info_heap(sn->regions[i]->data); - break; - case 1 : /* libsimgrid */ - XBT_INFO("Size of libsimgrid : %zu", sn->regions[i]->size); - break; - case 2 : /* data program */ - XBT_INFO("Size of data program : %zu", sn->regions[i]->size); - break; - case 3 : /* stack */ - XBT_INFO("Size of stack : %zu", sn->regions[i]->size); - XBT_INFO("Start addr of stack : %p", sn->regions[i]->start_addr); - break; - } - - } - -} - void MC_automaton_load(const char *file){ raw_mem_set = (mmalloc_get_current_heap() == raw_heap);