X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bdb1638f0b58057107eb87995b2d447e34dc43a0..d947ff7466b473eeec602007934f8336a9b17f3c:/src/mc/mc_dpor.c

diff --git a/src/mc/mc_dpor.c b/src/mc/mc_dpor.c
index 9576aada9d..017b0d0442 100644
--- a/src/mc/mc_dpor.c
+++ b/src/mc/mc_dpor.c
@@ -9,7 +9,6 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_dpor, mc,
                                 "Logging specific to MC DPOR exploration");
 
 xbt_dynar_t visited_states;
-int nb_visited_states = 0;
 
 static int is_visited_state(void);
 static void visited_state_free(mc_safety_visited_state_t state);
@@ -28,8 +27,6 @@ static void visited_state_free_voidp(void *s){
 
 static int is_visited_state(){
 
-  nb_visited_states++;
-
   if(_sg_mc_visited == 0)
     return 0;
 
@@ -40,7 +37,7 @@ static int is_visited_state(){
   mc_safety_visited_state_t new_state = NULL;
   new_state = xbt_new0(s_mc_safety_visited_state_t, 1);
   new_state->system_state = MC_take_snapshot();
-  new_state->num = nb_visited_states;
+  new_state->num = mc_stats->expanded_states;
 
   MC_UNSET_RAW_MEM;
   
@@ -81,6 +78,8 @@ static int is_visited_state(){
       if(chunks_used_test == current_chunks_used){
         same_chunks_not_found = 0;
         if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){
+          xbt_dynar_remove_at(visited_states, cursor, NULL);
+          xbt_dynar_insert_at(visited_states, cursor, &new_state);
           if(raw_mem_set)
             MC_SET_RAW_MEM;
           else
@@ -95,6 +94,8 @@ static int is_visited_state(){
             if(chunks_used_test != current_chunks_used)
               break;
             if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){
+              xbt_dynar_remove_at(visited_states, previous_cursor, NULL);
+              xbt_dynar_insert_at(visited_states, previous_cursor, &new_state);
               if(raw_mem_set)
                 MC_SET_RAW_MEM;
               else
@@ -110,6 +111,8 @@ static int is_visited_state(){
             if(chunks_used_test != current_chunks_used)
               break;
             if(snapshot_compare(new_state->system_state, state_test->system_state, NULL, NULL) == 0){
+              xbt_dynar_remove_at(visited_states, next_cursor, NULL);
+              xbt_dynar_insert_at(visited_states, next_cursor, &new_state);
               if(raw_mem_set)
                 MC_SET_RAW_MEM;
               else
@@ -121,11 +124,19 @@ static int is_visited_state(){
         }   
       }
     }
- 
-    if(xbt_dynar_length(visited_states) == _sg_mc_visited){
-      int min = nb_visited_states;
+
+    state_test = (mc_safety_visited_state_t)xbt_dynar_get_as(visited_states, cursor, mc_safety_visited_state_t);
+    chunks_used_test = mmalloc_get_chunks_used((xbt_mheap_t)(state_test->system_state)->regions[get_heap_region_index(state_test->system_state)]->data);
+
+    if(chunks_used_test < current_chunks_used)
+      xbt_dynar_insert_at(visited_states, cursor + 1, &new_state);
+    else
+      xbt_dynar_insert_at(visited_states, cursor, &new_state);
+
+    if(xbt_dynar_length(visited_states) > _sg_mc_visited){
+      int min = mc_stats->expanded_states;
       unsigned int cursor2 = 0;
-      unsigned int index;
+      unsigned int index = 0;
       xbt_dynar_foreach(visited_states, cursor2, state_test){
         if(state_test->num < min){
           index = cursor2;
@@ -134,14 +145,6 @@ static int is_visited_state(){
       }
       xbt_dynar_remove_at(visited_states, index, NULL);
     }
-
-    if(cursor > 0)
-      cursor--;
-
-    if(chunks_used_test < current_chunks_used)
-      xbt_dynar_insert_at(visited_states, cursor + 1, &new_state);
-    else
-      xbt_dynar_insert_at(visited_states, cursor, &new_state);
     
     MC_UNSET_RAW_MEM;