From: Marion Guthmuller <marion.guthmuller@loria.fr>
Date: Thu, 3 Oct 2013 17:47:05 +0000 (+0200)
Subject: model-checker : restore sequential system state comparison (parallel version is slowe... 
X-Git-Tag: v3_9_90~40^2~24
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/45cf10e0c743664310be804ca1d8d25edd3a18a7

model-checker : restore sequential system state comparison (parallel version is slower, for now ..)
---

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index a77f39ae85..f57d5c2532 100644
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -342,10 +342,10 @@ int snapshot_compare(void *state1, void *state2){
     num1 = ((mc_pair_t)state1)->num;
     num2 =  ((mc_pair_t)state2)->num;
     /* Firstly compare automaton state */
-    if(xbt_automaton_state_compare(((mc_pair_t)state1)->automaton_state, ((mc_pair_t)state2)->automaton_state) != 0)
+    /*if(xbt_automaton_state_compare(((mc_pair_t)state1)->automaton_state, ((mc_pair_t)state2)->automaton_state) != 0)
       return 1;
     if(xbt_automaton_propositional_symbols_compare_value(((mc_pair_t)state1)->atomic_propositions, ((mc_pair_t)state2)->atomic_propositions) != 0)
-      return 1;
+    return 1;*/
   }else{ /* Safety MC */
     s1 = ((mc_visited_state_t)state1)->system_state;
     s2 = ((mc_visited_state_t)state2)->system_state;
diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 4209fac184..58d9728dde 100644
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -118,13 +118,14 @@ static int is_visited_state(){
   }else{
 
     int min = -1, max = -1, index;
-    int res;
+    //int res;
     mc_visited_state_t state_test;
+    int cursor;
 
     index = get_search_interval(visited_states, new_state, &min, &max);
 
     if(min != -1 && max != -1){
-      res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_states, min), (max-min)+1, new_state);
+      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_states, min), (max-min)+1, new_state);
       if(res != -1){
         state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, (min+res)-1, mc_visited_state_t);
         if(state_test->other_num == -1)
@@ -140,7 +141,27 @@ static int is_visited_state(){
         if(!raw_mem_set)
           MC_UNSET_RAW_MEM;
         return new_state->other_num;
-      } 
+        }*/
+      cursor = min;
+      while(cursor <= max){
+        state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_visited_state_t);
+        if(snapshot_compare(state_test, new_state) == 0){
+          if(state_test->other_num == -1)
+            new_state->other_num = state_test->num;
+          else
+            new_state->other_num = state_test->other_num;
+          if(dot_output == NULL)
+            XBT_DEBUG("State %d already visited ! (equal to state %d)", new_state->num, state_test->num);
+          else
+            XBT_DEBUG("State %d already visited ! (equal to state %d (state %d in dot_output))", new_state->num, state_test->num, new_state->other_num);
+          xbt_dynar_remove_at(visited_states, cursor, NULL);
+          xbt_dynar_insert_at(visited_states, cursor, &new_state);
+          if(!raw_mem_set)
+            MC_UNSET_RAW_MEM;
+          return new_state->other_num;
+        }
+        cursor++;
+      }
       xbt_dynar_insert_at(visited_states, min, &new_state);
     }else{
       state_test = (mc_visited_state_t)xbt_dynar_get_as(visited_states, index, mc_visited_state_t);
diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index e62c1f68c5..117c99f7c2 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -117,17 +117,32 @@ static int is_reached_acceptance_pair(mc_pair_t pair){
     }
 
     int min = -1, max = -1, index;
-    int res;
+    //int res;
     mc_pair_t pair_test;
-    
+    int cursor;
+
     index = get_search_interval(acceptance_pairs, pair, &min, &max);
 
-    if(min != -1 && max != -1){ /* Acceptance pair with same number of processes and same heap bytes used exists */
-      res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(acceptance_pairs, min), (max-min)+1, pair);
+    if(min != -1 && max != -1){ // Acceptance pair with same number of processes and same heap bytes used exists
+      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(acceptance_pairs, min), (max-min)+1, pair);
       if(res != -1){
         if(!raw_mem_set)
           MC_UNSET_RAW_MEM;
         return ((mc_pair_t)xbt_dynar_get_as(acceptance_pairs, (min+res)-1, mc_pair_t))->num;
+        }*/
+      cursor = min;
+      while(cursor <= max){
+        pair_test = (mc_pair_t)xbt_dynar_get_as(acceptance_pairs, cursor, mc_pair_t);
+        if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){
+          if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){
+            if(snapshot_compare(pair_test, pair) == 0){
+              if(!raw_mem_set)
+                MC_UNSET_RAW_MEM;
+              return pair_test->num;
+            }
+          }
+        }
+        cursor++;
       }
       xbt_dynar_insert_at(acceptance_pairs, min, &pair);
     }else{
@@ -279,13 +294,14 @@ static int is_visited_pair(mc_pair_t pair){
       pair->graph_state->system_state = MC_take_snapshot();
 
     int min = -1, max = -1, index;
-    int res;
+    //int res;
     mc_pair_t pair_test;
+    int cursor;
 
     index = get_search_interval(visited_pairs, pair, &min, &max);
 
-    if(min != -1 && max != -1){ /* Visited pair with same number of processes and same heap bytes used exists */
-      res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair);
+    if(min != -1 && max != -1){ // Visited pair with same number of processes and same heap bytes used exists
+      /*res = xbt_parmap_mc_apply(parmap, snapshot_compare, xbt_dynar_get_ptr(visited_pairs, min), (max-min)+1, pair);
       if(res != -1){
         pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, (min+res)-1, mc_pair_t);
         if(pair_test->other_num == -1)
@@ -311,6 +327,40 @@ static int is_visited_pair(mc_pair_t pair){
         if(!raw_mem_set)
           MC_UNSET_RAW_MEM;
         return pair->other_num;
+        }*/
+      cursor = min;
+      while(cursor <= max){
+        pair_test = (mc_pair_t)xbt_dynar_get_as(visited_pairs, cursor, mc_pair_t);
+        if(xbt_automaton_state_compare(pair_test->automaton_state, pair->automaton_state) == 0){
+          if(xbt_automaton_propositional_symbols_compare_value(pair_test->atomic_propositions, pair->atomic_propositions) == 0){
+            if(snapshot_compare(pair_test, pair) == 0){
+              if(pair_test->other_num == -1)
+                pair->other_num = pair_test->num;
+              else
+                pair->other_num = pair_test->other_num;
+              if(dot_output == NULL)
+                XBT_DEBUG("Pair %d already visited ! (equal to pair %d)", pair->num, pair_test->num);
+              else
+                XBT_DEBUG("Pair %d already visited ! (equal to pair %d (pair %d in dot_output))", pair->num, pair_test->num, pair->other_num);
+              xbt_dynar_remove_at(visited_pairs, cursor, NULL);
+              xbt_dynar_insert_at(visited_pairs, cursor, &pair);
+              pair_test->visited_removed = 1;
+              if(pair_test->stack_removed && pair_test->visited_removed){
+                if((pair_test->automaton_state->type == 1) || (pair_test->automaton_state->type == 2)){
+                  if(pair_test->acceptance_removed){
+                    MC_pair_delete(pair_test);
+                  }
+                }else{
+                  MC_pair_delete(pair_test);
+                }
+              }
+              if(!raw_mem_set)
+                MC_UNSET_RAW_MEM;
+              return pair->other_num;
+            }
+          }
+        }
+        cursor++;
       }
       xbt_dynar_insert_at(visited_pairs, min, &pair);
     }else{