Use xbt_malloc (and friends) instead of direct malloc()

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

diff --git a/src/mc/mc_liveness.c b/src/mc/mc_liveness.c
index 9721676..7056018 100644 (file)
--- a/src/mc/mc_liveness.c
+++ b/src/mc/mc_liveness.c
@@ -41,7 +41,7 @@ int create_dump(int pair)
     if(wait(&status) < 0)
       perror("wait");
     if(WIFSIGNALED(status) && WCOREDUMP(status)){
-      char *core_name = malloc(20);
+      char *core_name = xbt_malloc(20);
       sprintf(core_name,"core_%d", pair); 
       rename("core", core_name);
       free(core_name);
@@ -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;
@@ -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);
@@ -377,7 +377,7 @@ int visited(xbt_state_t st){
       }
     }
 
-    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);
     }
 
@@ -484,8 +484,8 @@ void pair_reached_free(mc_pair_reached_t pair){
       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->program_data_segment_comparison_times));
-      xbt_dynar_free(&(pair->comparison_times->libsimgrid_data_segment_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));
     }
@@ -502,9 +502,9 @@ void MC_ddfs_init(void){
 
   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;
@@ -618,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){
 
@@ -858,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{
 
@@ -923,7 +923,7 @@ void MC_ddfs(int search_cycle){
     
   }
 
-  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) );