model-checker : keep MC_request_to_string in std heap

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

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index a49dbfb..6e86e52 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -156,7 +156,7 @@ int reached(xbt_state_t st){
     /* Get values of propositional symbols */
     unsigned int cursor = 0;
     xbt_propositional_symbol_t ps = NULL;
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
       f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
@@ -384,7 +384,7 @@ void set_pair_reached(xbt_state_t st){
   int res;
   int_f_void_t f;
 
-  xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
     f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
@@ -449,7 +449,7 @@ int reached_hash(xbt_state_t st){
     int res;
     int_f_void_t f;
 
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
       f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
@@ -523,7 +523,7 @@ void set_pair_reached_hash(xbt_state_t st){
   int res;
   int_f_void_t f;
 
-  xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
     f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
@@ -560,7 +560,7 @@ int visited(xbt_state_t st, int sc){
     int res;
     int_f_void_t f;
 
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
       f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
@@ -635,7 +635,7 @@ int visited_hash(xbt_state_t st, int sc){
     int res;
     int_f_void_t f;
 
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
       f = (int_f_void_t)ps->function;
       res = (*f)();
       xbt_dynar_push_as(prop_ato, int, res);
@@ -713,7 +713,7 @@ void set_pair_visited_hash(xbt_state_t st, int sc){
   int res;
   int_f_void_t f;
 
-  xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
     f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
@@ -747,7 +747,7 @@ void set_pair_visited(xbt_state_t st, int sc){
   int res;
   int_f_void_t f;
 
-  xbt_dynar_foreach(automaton->propositional_symbols, cursor, ps){
+  xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, ps){
     f = (int_f_void_t)ps->function;
     res = (*f)();
     xbt_dynar_push_as(pair->prop_ato, int, res);
@@ -789,7 +789,7 @@ int MC_automaton_evaluate_label(xbt_exp_label_t l){
     unsigned int cursor = 0;
     xbt_propositional_symbol_t p = NULL;
     int_f_void_t f;
-    xbt_dynar_foreach(automaton->propositional_symbols, cursor, p){
+    xbt_dynar_foreach(_mc_property_automaton->propositional_symbols, cursor, p){
       if(strcmp(p->pred, l->u.predicat) == 0){
         f = (int_f_void_t)p->function;
         return (*f)();
@@ -849,7 +849,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 */
@@ -861,7 +861,7 @@ void MC_ddfs_init(void){
   unsigned int cursor = 0;
   xbt_state_t state;
 
-  xbt_dynar_foreach(automaton->states, cursor, state){
+  xbt_dynar_foreach(_mc_property_automaton->states, cursor, state){
     if(state->type == -1){
       
       MC_SET_RAW_MEM;
@@ -914,7 +914,7 @@ void MC_ddfs(int search_cycle){
   current_pair = (mc_pair_stateless_t)xbt_fifo_get_item_content(xbt_fifo_get_first_item(mc_stack_liveness));
 
   /* Update current state in buchi automaton */
-  automaton->current_state = current_pair->automaton_state;
+  _mc_property_automaton->current_state = current_pair->automaton_state;
 
  
   XBT_INFO("********************* ( Depth = %d, search_cycle = %d )", xbt_fifo_size(mc_stack_liveness), search_cycle);
@@ -939,10 +939,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 +1051,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 +1060,11 @@ void MC_ddfs(int search_cycle){
     
                 MC_ddfs(search_cycle);
     
-              }else{
+                /*}else{
 
                 XBT_INFO("Next pair already visited ! ");
 
-              }
+                }*/
         
             }
 
@@ -1084,7 +1084,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 +1093,11 @@ void MC_ddfs(int search_cycle){
         
               MC_ddfs(search_cycle);
         
-            }else{
+              /*}else{
 
               XBT_INFO("Next pair already visited ! ");
 
-            }
+              }*/
 
           }
 
@@ -1199,7 +1199,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 +1208,11 @@ void MC_ddfs(int search_cycle){
         
               MC_ddfs(search_cycle);
         
-            }else{
+              /*}else{
 
               XBT_INFO("Next pair already visited ! ");
 
-            }
+              }*/
           }
       
 
@@ -1230,7 +1230,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 +1239,11 @@ void MC_ddfs(int search_cycle){
       
             MC_ddfs(search_cycle);
       
-          }else{
+            /*}else{
 
             XBT_INFO("Next pair already visited ! ");
 
-          }
+            }*/
 
         }