model-checker : check current_heap before SET_RAW_MEM and restore it after UNSET_RAW_MEM

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

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 08a6d54..1b05a14 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -137,6 +137,8 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
 int reached(xbt_state_t st){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
 
   if(xbt_dynar_is_empty(reached_pairs)){
 
@@ -180,6 +182,12 @@ int reached(xbt_state_t st){
             xbt_dynar_reset(prop_ato);
             xbt_free(prop_ato);
             MC_UNSET_RAW_MEM;
+
+            if(raw_mem_set)
+              MC_SET_RAW_MEM;
+            else
+              MC_UNSET_RAW_MEM;
+            
             return 1;
           }
           /* }
@@ -198,6 +206,12 @@ int reached(xbt_state_t st){
     xbt_dynar_reset(prop_ato);
     xbt_free(prop_ato);
     MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    else
+      MC_UNSET_RAW_MEM;
+    
     return 0;
     
   }
@@ -366,6 +380,7 @@ int rdv_points_compare(xbt_dict_t d1, xbt_dict_t d2){ /* d1 = pair_test, d2 = cu
 
 void set_pair_reached(xbt_state_t st){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
   
@@ -417,12 +432,18 @@ void set_pair_reached(xbt_state_t st){
   xbt_dynar_push(reached_pairs, &pair); 
 
   MC_UNSET_RAW_MEM;
-  
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+    
 }
 
 
 int reached_hash(xbt_state_t st){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   if(xbt_dynar_is_empty(reached_pairs_hash)){
 
@@ -475,6 +496,12 @@ int reached_hash(xbt_state_t st){
             xbt_dynar_reset(prop_ato);
             xbt_free(prop_ato);
             MC_UNSET_RAW_MEM;
+
+            if(raw_mem_set)
+              MC_SET_RAW_MEM;
+            else
+              MC_UNSET_RAW_MEM;
+            
             return 1;
           }else{
             XBT_INFO("Different snapshot");
@@ -493,12 +520,20 @@ int reached_hash(xbt_state_t st){
     xbt_dynar_reset(prop_ato);
     xbt_free(prop_ato);
     MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    else
+      MC_UNSET_RAW_MEM;
+    
     return 0;
     
   }
 }
 
 void set_pair_reached_hash(xbt_state_t st){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
 
@@ -534,12 +569,18 @@ void set_pair_reached_hash(xbt_state_t st){
   MC_free_snapshot(sn);
   
   MC_UNSET_RAW_MEM;
-    
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+      
 }
 
 
 int visited(xbt_state_t st, int sc){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   if(xbt_dynar_is_empty(visited_pairs)){
 
@@ -580,6 +621,11 @@ int visited(xbt_state_t st, int sc){
               xbt_free(prop_ato);
               MC_UNSET_RAW_MEM;
     
+              if(raw_mem_set)
+                MC_SET_RAW_MEM;
+              else
+                MC_UNSET_RAW_MEM;
+              
               return 1;
   
             }else{
@@ -601,6 +647,12 @@ int visited(xbt_state_t st, int sc){
     xbt_dynar_reset(prop_ato);
     xbt_free(prop_ato);
     MC_UNSET_RAW_MEM;
+
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    else
+      MC_UNSET_RAW_MEM;
+    
     return 0;
     
   }
@@ -609,6 +661,7 @@ int visited(xbt_state_t st, int sc){
 
 int visited_hash(xbt_state_t st, int sc){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   if(xbt_dynar_is_empty(visited_pairs_hash)){
 
@@ -661,6 +714,12 @@ int visited_hash(xbt_state_t st, int sc){
               xbt_dynar_reset(prop_ato);
               xbt_free(prop_ato);
               MC_UNSET_RAW_MEM;
+              
+              if(raw_mem_set)
+                MC_SET_RAW_MEM;
+              else
+                MC_UNSET_RAW_MEM;
+  
               return 1;
             }else{
               //XBT_INFO("Different snapshot");
@@ -682,12 +741,20 @@ int visited_hash(xbt_state_t st, int sc){
     xbt_dynar_reset(prop_ato);
     xbt_free(prop_ato);
     MC_UNSET_RAW_MEM;
+  
+    if(raw_mem_set)
+      MC_SET_RAW_MEM;
+    else
+      MC_UNSET_RAW_MEM;
+  
     return 0;
     
   }
 }
 
 void set_pair_visited_hash(xbt_state_t st, int sc){
+
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
 
@@ -725,10 +792,16 @@ void set_pair_visited_hash(xbt_state_t st, int sc){
   
   MC_UNSET_RAW_MEM;
     
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 }
 
 void set_pair_visited(xbt_state_t st, int sc){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
  
@@ -757,6 +830,10 @@ void set_pair_visited(xbt_state_t st, int sc){
   
   MC_UNSET_RAW_MEM;
   
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
   
 }
 
@@ -826,6 +903,8 @@ mc_pair_stateless_t new_pair_stateless(mc_state_t sg, xbt_state_t st, int r){
 
 void MC_ddfs_init(void){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   XBT_INFO("**************************************************");
   XBT_INFO("Double-DFS init");
   XBT_INFO("**************************************************");
@@ -849,7 +928,7 @@ void MC_ddfs_init(void){
   reached_pairs = xbt_dynar_new(sizeof(mc_pair_reached_t), NULL);
   //reached_pairs_hash = xbt_dynar_new(sizeof(mc_pair_reached_hash_t), NULL);
   //visited_pairs = xbt_dynar_new(sizeof(mc_pair_visited_t), NULL);
-  visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL);
+  //visited_pairs_hash = xbt_dynar_new(sizeof(mc_pair_visited_hash_t), NULL);
   successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
 
   /* Save the initial state */
@@ -896,13 +975,21 @@ void MC_ddfs_init(void){
   
       }
     }
-  } 
+  }
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
+  
 
 }
 
 
 void MC_ddfs(int search_cycle){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+
   smx_process_t process;
   mc_pair_stateless_t current_pair = NULL;
 
@@ -939,10 +1026,10 @@ void MC_ddfs(int search_cycle){
   if(xbt_fifo_size(mc_stack_liveness) < MAX_DEPTH_LIVENESS){
 
     //set_pair_visited(current_pair->automaton_state, search_cycle);
-    set_pair_visited_hash(current_pair->automaton_state, search_cycle);
+    //set_pair_visited_hash(current_pair->automaton_state, search_cycle);
 
     //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs));
-    XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash));
+    //XBT_INFO("Visited pairs : %lu", xbt_dynar_length(visited_pairs_hash));
 
     if(current_pair->requests > 0){
 
@@ -1051,7 +1138,7 @@ void MC_ddfs(int search_cycle){
 
             }else{
 
-              if(!visited_hash(pair_succ->automaton_state, search_cycle)){
+              //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
                 //if(!visited(pair_succ->automaton_state, search_cycle)){
     
                 MC_SET_RAW_MEM;
@@ -1060,11 +1147,11 @@ void MC_ddfs(int search_cycle){
     
                 MC_ddfs(search_cycle);
     
-              }else{
+                /*}else{
 
                 XBT_INFO("Next pair already visited ! ");
 
-              }
+                }*/
         
             }
 
@@ -1084,7 +1171,7 @@ void MC_ddfs(int search_cycle){
 
             }
 
-            if(!visited_hash(pair_succ->automaton_state, search_cycle)){
+            //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
               //if(!visited(pair_succ->automaton_state, search_cycle)){
         
               MC_SET_RAW_MEM;
@@ -1093,11 +1180,11 @@ void MC_ddfs(int search_cycle){
         
               MC_ddfs(search_cycle);
         
-            }else{
+              /*}else{
 
               XBT_INFO("Next pair already visited ! ");
 
-            }
+              }*/
 
           }
 
@@ -1199,7 +1286,7 @@ void MC_ddfs(int search_cycle){
 
           }else{
 
-            if(!visited_hash(pair_succ->automaton_state, search_cycle)){
+            //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
               //if(!visited(pair_succ->automaton_state, search_cycle)){
 
               MC_SET_RAW_MEM;
@@ -1208,11 +1295,11 @@ void MC_ddfs(int search_cycle){
         
               MC_ddfs(search_cycle);
         
-            }else{
+              /*}else{
 
               XBT_INFO("Next pair already visited ! ");
 
-            }
+              }*/
           }
       
 
@@ -1230,7 +1317,7 @@ void MC_ddfs(int search_cycle){
 
           }
 
-          if(!visited_hash(pair_succ->automaton_state, search_cycle)){
+          //if(!visited_hash(pair_succ->automaton_state, search_cycle)){
             //if(!visited(pair_succ->automaton_state, search_cycle)){
 
             MC_SET_RAW_MEM;
@@ -1239,11 +1326,11 @@ void MC_ddfs(int search_cycle){
       
             MC_ddfs(search_cycle);
       
-          }else{
+            /*}else{
 
             XBT_INFO("Next pair already visited ! ");
 
-          }
+            }*/
 
         }
 
@@ -1276,8 +1363,11 @@ void MC_ddfs(int search_cycle){
     //xbt_dynar_pop(reached_pairs_hash, NULL);
   }
   MC_UNSET_RAW_MEM;
-  
-  
+
+  if(raw_mem_set)
+    MC_SET_RAW_MEM;
+  else
+    MC_UNSET_RAW_MEM;
 
 }