X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c6189d1b7b02cda083791afc98f7e632100424d5..78c8b9893aa6947905617155ed8fa2538147e5e8:/src/mc/mc_liveness.c

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 778c88e9ba..b80b31954a 100644
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -90,36 +90,36 @@ void MC_print_comparison_times_statistics(mc_comparison_times_t ct){
     XBT_DEBUG("Stacks sizes comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->stacks_sizes_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->stacks_sizes_comparison_times), max, min);
   }
 
-  if(xbt_dynar_length(ct->program_data_segment_comparison_times) > 0){
+  if(xbt_dynar_length(ct->binary_global_variables_comparison_times) > 0){
     cursor = 0;
     total = 0.0;
     max = 0.0;
-    min = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
-    while(cursor < xbt_dynar_length(ct->program_data_segment_comparison_times) - 1){
-      total += xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
-      if(xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double) > max)
-        max = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
-      if(xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double) < min)
-        min = xbt_dynar_get_as(ct->program_data_segment_comparison_times, cursor, double);
+    min = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
+    while(cursor < xbt_dynar_length(ct->binary_global_variables_comparison_times) - 1){
+      total += xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
+      if(xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double) > max)
+        max = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
+      if(xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double) < min)
+        min = xbt_dynar_get_as(ct->binary_global_variables_comparison_times, cursor, double);
       cursor++;
     }
-    XBT_DEBUG("Program data/bss segments comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->program_data_segment_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->program_data_segment_comparison_times), max, min);
+    XBT_DEBUG("Binary global variables comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->binary_global_variables_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->binary_global_variables_comparison_times), max, min);
   }
 
-  if(xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times) > 0){
+  if(xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times) > 0){
     cursor = 0;
     total = 0.0;
     max = 0.0;
-    min = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
-    while(cursor < xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times) - 1){
-      total += xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
-      if(xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double) > max)
-        max = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
-      if(xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double) < min)
-        min = xbt_dynar_get_as(ct->libsimgrid_data_segment_comparison_times, cursor, double);
+    min = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
+    while(cursor < xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times) - 1){
+      total += xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
+      if(xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double) > max)
+        max = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
+      if(xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double) < min)
+        min = xbt_dynar_get_as(ct->libsimgrid_global_variables_comparison_times, cursor, double);
       cursor++;
     }
-    XBT_DEBUG("Libsimgrid data/bss segments comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->libsimgrid_data_segment_comparison_times), max, min);
+    XBT_DEBUG("Libsimgrid global variables comparison -- Different states : %lu/%d, time (in seconds) : average = %lf, max = %lf, min = %lf", xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times), ct->nb_comparisons, total/xbt_dynar_length(ct->libsimgrid_global_variables_comparison_times), max, min);
   }
 
   if(xbt_dynar_length(ct->heap_comparison_times) > 0){
@@ -179,8 +179,8 @@ mc_comparison_times_t new_comparison_times(){
   ct->snapshot_comparison_times = xbt_dynar_new(sizeof(double), NULL);
   ct->chunks_used_comparison_times = xbt_dynar_new(sizeof(double), NULL);
   ct->stacks_sizes_comparison_times = xbt_dynar_new(sizeof(double), NULL);
-  ct->program_data_segment_comparison_times = xbt_dynar_new(sizeof(double), NULL);
-  ct->libsimgrid_data_segment_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+  ct->binary_global_variables_comparison_times = xbt_dynar_new(sizeof(double), NULL);
+  ct->libsimgrid_global_variables_comparison_times = xbt_dynar_new(sizeof(double), NULL);
   ct->heap_comparison_times = xbt_dynar_new(sizeof(double), NULL);
   ct->stacks_comparison_times = xbt_dynar_new(sizeof(double), NULL);
   return ct;
@@ -188,7 +188,7 @@ mc_comparison_times_t new_comparison_times(){
 
 int reached(xbt_state_t st){
 
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   MC_SET_RAW_MEM;
 
@@ -198,7 +198,7 @@ int reached(xbt_state_t st){
   new_pair->automaton_state = st;
   new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
   new_pair->comparison_times = new_comparison_times();
-  new_pair->system_state = MC_take_snapshot_liveness();  
+  new_pair->system_state = MC_take_snapshot();  
   
   /* Get values of propositional symbols */
   int res;
@@ -247,10 +247,10 @@ int reached(xbt_state_t st){
             return 1;
           }       
         }else{
-          XBT_INFO("Different values of propositional symbols");
+          XBT_DEBUG("Different values of propositional symbols");
         }
       }else{
-        XBT_INFO("Different automaton state");
+        XBT_DEBUG("Different automaton state");
       }
       if(pair_test->comparison_times != NULL && XBT_LOG_ISENABLED(mc_liveness, xbt_log_priority_debug)){
         XBT_DEBUG("*** Comparison times statistics ***");
@@ -276,7 +276,7 @@ int reached(xbt_state_t st){
 
 void set_pair_reached(xbt_state_t st){
 
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
  
   MC_SET_RAW_MEM;
 
@@ -286,7 +286,7 @@ void set_pair_reached(xbt_state_t st){
   pair->automaton_state = st;
   pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
   pair->comparison_times = new_comparison_times();
-  pair->system_state = MC_take_snapshot_liveness();
+  pair->system_state = MC_take_snapshot();
 
   /* Get values of propositional symbols */
   unsigned int cursor = 0;
@@ -311,7 +311,7 @@ void set_pair_reached(xbt_state_t st){
 
 int visited(xbt_state_t st){
 
-  if(_surf_mc_stateful == 0)
+  if(_sg_mc_visited == 0)
     return 0;
 
   int raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
@@ -322,7 +322,7 @@ int visited(xbt_state_t st){
   new_pair = xbt_new0(s_mc_pair_visited_t, 1);
   new_pair->automaton_state = st;
   new_pair->prop_ato = xbt_dynar_new(sizeof(int), NULL);
-  new_pair->system_state = MC_take_snapshot_liveness();  
+  new_pair->system_state = MC_take_snapshot();  
   
   /* Get values of propositional symbols */
   int res;
@@ -370,14 +370,14 @@ int visited(xbt_state_t st){
             return 1;
           }   
         }else{
-          XBT_INFO("Different values of propositional symbols");
+          XBT_DEBUG("Different values of propositional symbols");
         }
       }else{
-        XBT_INFO("Different automaton state");
+        XBT_DEBUG("Different automaton state");
       }
     }
 
-    if(xbt_dynar_length(visited_pairs) == _surf_mc_stateful){
+    if(xbt_dynar_length(visited_pairs) == _sg_mc_visited){
       xbt_dynar_remove_at(visited_pairs, 0, NULL);
     }
 
@@ -480,6 +480,15 @@ void pair_reached_free(mc_pair_reached_t pair){
   if(pair){
     pair->automaton_state = NULL;
     xbt_dynar_free(&(pair->prop_ato));
+    if(pair->comparison_times != NULL){
+      xbt_dynar_free(&(pair->comparison_times->snapshot_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->chunks_used_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->stacks_sizes_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->binary_global_variables_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->libsimgrid_global_variables_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->heap_comparison_times));
+      xbt_dynar_free(&(pair->comparison_times->stacks_comparison_times));
+    }
     MC_free_snapshot(pair->system_state);
     xbt_free(pair);
   }
@@ -491,11 +500,11 @@ void pair_reached_free_voidp(void *p){
 
 void MC_ddfs_init(void){
 
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
-  XBT_INFO("**************************************************");
-  XBT_INFO("Double-DFS init");
-  XBT_INFO("**************************************************");
+  XBT_DEBUG("**************************************************");
+  XBT_DEBUG("Double-DFS init");
+  XBT_DEBUG("**************************************************");
 
   mc_pair_stateless_t mc_initial_pair = NULL;
   mc_state_t initial_graph_state = NULL;
@@ -518,7 +527,7 @@ void MC_ddfs_init(void){
   successors = xbt_dynar_new(sizeof(mc_pair_stateless_t), NULL);
 
   /* Save the initial state */
-  initial_state_liveness->initial_snapshot = MC_take_snapshot_liveness();
+  initial_state_liveness->snapshot = MC_take_snapshot();
 
   MC_UNSET_RAW_MEM; 
   
@@ -534,7 +543,7 @@ void MC_ddfs_init(void){
       MC_UNSET_RAW_MEM;
       
       if(cursor != 0){
-        MC_restore_snapshot(initial_state_liveness->initial_snapshot);
+        MC_restore_snapshot(initial_state_liveness->snapshot);
         MC_UNSET_RAW_MEM;
       }
 
@@ -551,7 +560,7 @@ void MC_ddfs_init(void){
         set_pair_reached(state);
 
         if(cursor != 0){
-          MC_restore_snapshot(initial_state_liveness->initial_snapshot);
+          MC_restore_snapshot(initial_state_liveness->snapshot);
           MC_UNSET_RAW_MEM;
         }
   
@@ -561,7 +570,7 @@ void MC_ddfs_init(void){
     }
   }
 
-  if(raw_mem_set)
+  if(initial_state_liveness->raw_mem_set)
     MC_SET_RAW_MEM;
   else
     MC_UNSET_RAW_MEM;
@@ -572,7 +581,7 @@ void MC_ddfs_init(void){
 
 void MC_ddfs(int search_cycle){
 
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  //initial_state_liveness->raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
 
   smx_process_t process;
   mc_pair_stateless_t current_pair = NULL;
@@ -609,7 +618,7 @@ void MC_ddfs(int search_cycle){
   mc_pair_stateless_t remove_pair;
   mc_pair_reached_t remove_pair_reached;
   
-  if(xbt_fifo_size(mc_stack_liveness) < _surf_mc_max_depth){
+  if(xbt_fifo_size(mc_stack_liveness) < _sg_mc_max_depth){
 
     if(current_pair->requests > 0){
 
@@ -635,7 +644,6 @@ void MC_ddfs(int search_cycle){
         next_graph_state = MC_state_pair_new();
 
         /* Get enabled process and insert it in the interleave set of the next graph_state */
-
         xbt_swag_foreach(process, simix_global->process_list){
           if(MC_process_is_enabled(process)){
             XBT_DEBUG("Process %lu enabled with simcall : %d", process->pid, (&process->simcall)->call); 
@@ -850,7 +858,7 @@ void MC_ddfs(int search_cycle){
               MC_show_stack_liveness(mc_stack_liveness);
               MC_dump_stack_liveness(mc_stack_liveness);
               MC_print_statistics_pairs(mc_stats_pair);
-              exit(0);
+              xbt_abort();
 
             }else{
 
@@ -907,11 +915,15 @@ void MC_ddfs(int search_cycle){
     
   }else{
     
-    XBT_DEBUG("Max depth reached");
-
+    XBT_WARN("/!\\ Max depth reached ! /!\\ ");
+    if(current_pair->requests > 0){
+      XBT_WARN("/!\\ But, there are still processes to interleave. Model-checker will not be able to ensure the soundness of the verification from now. /!\\ "); 
+      XBT_WARN("Notice : the default value of max depth is 1000 but you can change it with cfg=model-check/max_depth:value.");
+    }
+    
   }
 
-  if(xbt_fifo_size(mc_stack_liveness) == _surf_mc_max_depth ){
+  if(xbt_fifo_size(mc_stack_liveness) == _sg_mc_max_depth ){
     XBT_DEBUG("Pair (depth = %d) shifted in stack, maximum depth reached", xbt_fifo_size(mc_stack_liveness) );
   }else{
     XBT_DEBUG("Pair (depth = %d) shifted in stack", xbt_fifo_size(mc_stack_liveness) );
@@ -929,7 +941,7 @@ void MC_ddfs(int search_cycle){
   }
   MC_UNSET_RAW_MEM;
 
-  if(raw_mem_set)
-    MC_SET_RAW_MEM;
+  /*if(initial_state_liveness->raw_mem_set)
+    MC_SET_RAW_MEM;*/
 
 }