Don't define variables in header files (part 2).

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

diff --git a/src/mc/mc_global.c b/src/mc/mc_global.c
index 4876944..476c4d4 100644 (file)
--- a/src/mc/mc_global.c
+++ b/src/mc/mc_global.c
@@ -21,7 +21,11 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_global, mc,
 /* Configuration support */
 e_mc_reduce_t mc_reduce_kind=e_mc_reduce_unset;
 
+extern int _surf_init_status;
 void _mc_cfg_cb_reduce(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a reduction strategy after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
   char *val= xbt_cfg_get_string(_surf_cfg_set, name);
   if (!strcasecmp(val,"none")) {
     mc_reduce_kind = e_mc_reduce_none;
@@ -34,10 +38,16 @@ void _mc_cfg_cb_reduce(const char *name, int pos) {
 }
 
 void _mc_cfg_cb_checkpoint(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a checkpointing value after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
   _surf_mc_checkpoint = xbt_cfg_get_int(_surf_cfg_set, name);
   xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
 }
 void _mc_cfg_cb_property(const char *name, int pos) {
+  if (_surf_init_status && !_surf_do_model_check) {
+    xbt_die("You are specifying a property after the initialization (through MSG_config?), but model-checking was not activated at config time (through --cfg=model-check:1). This won't work, sorry.");
+  }
   _surf_mc_property_file= xbt_cfg_get_string(_surf_cfg_set, name);
   xbt_cfg_set_int(_surf_cfg_set,"model-check",1);
 }
@@ -49,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 */
 
@@ -90,6 +101,8 @@ void MC_do_the_modelcheck_for_real() {
 void MC_init_safety(void)
 {
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   /* Check if MC is already initialized */
   if (initial_snapshot)
     return;
@@ -98,6 +111,7 @@ void MC_init_safety(void)
 
   /* Initialize the data structures that must be persistent across every
      iteration of the model-checker (in RAW memory) */
+  
   MC_SET_RAW_MEM;
 
   /* Initialize statistics */
@@ -117,6 +131,11 @@ void MC_init_safety(void)
   MC_take_snapshot(initial_snapshot);
   MC_UNSET_RAW_MEM;
 
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
 
@@ -128,6 +147,9 @@ void MC_modelcheck(void)
 }
 
 void MC_modelcheck_liveness(){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   /* init stuff */
   XBT_DEBUG("Start init mc");
   
@@ -153,8 +175,8 @@ void MC_modelcheck_liveness(){
 
   /* We're done */
   MC_print_statistics_pairs(mc_stats_pair);
-  //xbt_free(mc_time);
-  //MC_memory_exit();
+  xbt_free(mc_time);
+  MC_memory_exit();
   exit(0);
 }
 
@@ -217,6 +239,8 @@ int MC_deadlock_check()
  */
 void MC_replay(xbt_fifo_t stack, int start)
 {
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   int value, i = 1;
   char *req_str;
   smx_simcall_t req = NULL, saved_req = NULL;
@@ -270,10 +294,20 @@ void MC_replay(xbt_fifo_t stack, int start)
     mc_stats->executed_transitions++;
   }
   XBT_DEBUG("**** End Replay ****");
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
+
 }
 
 void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
 {
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   int value;
   char *req_str;
   smx_simcall_t req = NULL, saved_req = NULL;
@@ -373,6 +407,12 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
   }  
 
   XBT_DEBUG("**** End Replay ****");
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
 /**
@@ -382,6 +422,8 @@ void MC_replay_liveness(xbt_fifo_t stack, int all_stack)
  */
 void MC_dump_stack_safety(xbt_fifo_t stack)
 {
+  
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   MC_show_stack_safety(stack);
 
@@ -395,6 +437,12 @@ void MC_dump_stack_safety(xbt_fifo_t stack)
     MC_UNSET_RAW_MEM;
 
   }
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
 
@@ -457,12 +505,21 @@ void MC_show_stack_liveness(xbt_fifo_t stack){
 }
 
 void MC_dump_stack_liveness(xbt_fifo_t stack){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   mc_pair_stateless_t pair;
 
   MC_SET_RAW_MEM;
   while ((pair = (mc_pair_stateless_t) xbt_fifo_pop(stack)) != NULL)
     MC_pair_stateless_delete(pair);
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+
 }
 
 
@@ -561,18 +618,41 @@ void MC_diff(void){
 }
 
 void MC_automaton_load(const char *file){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   MC_SET_RAW_MEM;
 
   if (_mc_property_automaton == NULL)
     _mc_property_automaton = xbt_automaton_new();
+  
   xbt_automaton_load(_mc_property_automaton,file);
 
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+
 }
+
 void MC_automaton_new_propositional_symbol(const char* id, void* fct) {
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   MC_SET_RAW_MEM;
+
   if (_mc_property_automaton == NULL)
     _mc_property_automaton = xbt_automaton_new();
+
   xbt_new_propositional_symbol(_mc_property_automaton,id,fct);
+
   MC_UNSET_RAW_MEM;
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }