X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/de2ba1766285962d449105925be099707e0102e6..2d8659efd37976d438feae7108ca944efe38adac:/src/mc/mc_compare.c

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index aec9b8cc01..7ed2201f89 100644
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -10,20 +10,16 @@
 XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc,
                                 "Logging specific to mc_compare");
 
-static int data_bss_program_region_compare(void *d1, void *d2, size_t size);
-static int data_bss_libsimgrid_region_compare(void *d1, void *d2, size_t size);
 static int heap_region_compare(void *d1, void *d2, size_t size);
 
-static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *sp2, void *heap1, void *heap2, xbt_dynar_t equals);
 static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2);
 static size_t heap_ignore_size(void *address);
-static size_t data_bss_ignore_size(void *address);
 
 static void stack_region_free(stack_region_t s);
 static void heap_equality_free(heap_equality_t e);
 
-static int is_stack_ignore_variable(char *frame, char *var_name);
-static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals);
+static int compare_local_variables(char *s1, char *s2);
+static int compare_global_variables(int region_type, void *d1, void *d2);
 
 static size_t heap_ignore_size(void *address){
   unsigned int cursor = 0;
@@ -45,84 +41,90 @@ static size_t heap_ignore_size(void *address){
   return 0;
 }
 
-static size_t data_bss_ignore_size(void *address){
-  unsigned int cursor = 0;
-  int start = 0;
-  int end = xbt_dynar_length(mc_data_bss_comparison_ignore) - 1;
-  mc_data_bss_ignore_variable_t var;
+static int compare_global_variables(int region_type, void *d1, void *d2){
 
-  while(start <= end){
-    cursor = (start + end) / 2;
-    var = (mc_data_bss_ignore_variable_t)xbt_dynar_get_as(mc_data_bss_comparison_ignore, cursor, mc_data_bss_ignore_variable_t);
-    if(var->address == address)
-      return var->size;
-    if(var->address < address)
-      start = cursor + 1;
-    if(var->address > address)
-      end = cursor - 1;   
-  }
-
-  return 0;
-}
-
-static int data_bss_program_region_compare(void *d1, void *d2, size_t size){
-
-  size_t i = 0;
-  int pointer_align;
-  void *addr_pointed1 = NULL, *addr_pointed2 = NULL;
-  
-  for(i=0; i<size; i++){
-    if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
-      pointer_align = (i / sizeof(void*)) * sizeof(void*);
-      addr_pointed1 = *((void **)((char *)d1 + pointer_align));
-      addr_pointed2 = *((void **)((char *)d2 + pointer_align));
-      if((addr_pointed1 > start_plt_binary && addr_pointed1 < end_plt_binary) || (addr_pointed2 > start_plt_binary && addr_pointed2 < end_plt_binary)){
-        continue;
-      }else{
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
-          XBT_VERB("Different byte (offset=%zu) (%p - %p) in data program region", i, (char *)d1 + i, (char *)d2 + i);
-          XBT_VERB("Addresses pointed : %p - %p\n", addr_pointed1, addr_pointed2);
-        }
-        return 1;
-      }
-    }
-  }
-  
-  return 0;
-}
-
-static int data_bss_libsimgrid_region_compare(void *d1, void *d2, size_t size){
-
-  size_t i = 0, ignore_size = 0;
-  int pointer_align;
+  unsigned int cursor = 0;
+  size_t offset; 
+  int i = 0;
+  global_variable_t current_var; 
+  int pointer_align; 
   void *addr_pointed1 = NULL, *addr_pointed2 = NULL;
+  int res_compare = 0;
 
-  for(i=0; i<size; i++){
-    if(memcmp(((char *)d1) + i, ((char *)d2) + i, 1) != 0){
-      if((ignore_size = data_bss_ignore_size((char *)start_data_libsimgrid+i)) > 0){
-        i = i + ignore_size;
-        continue;
-      }else if((ignore_size = data_bss_ignore_size((char *)start_bss_libsimgrid+i)) > 0){
-        i = i + ignore_size;
+  if(region_type == 1){ /* libsimgrid */
+    xbt_dynar_foreach(mc_global_variables, cursor, current_var){
+      if(current_var->address < start_data_libsimgrid)
         continue;
+      offset = (char *)current_var->address - (char *)start_data_libsimgrid;
+      i = 0;
+      while(i < current_var->size){
+        if(memcmp((char*)d1 + offset + i, (char*)d2 + offset + i, 1) != 0){
+          pointer_align = (i / sizeof(void*)) * sizeof(void*); 
+          addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
+          addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
+          if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) 
+             || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){
+            i = current_var->size;
+            continue;
+          }else{
+            if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) 
+               && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
+              res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
+              if(res_compare == 1){
+                #ifdef MC_VERBOSE
+                  XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+                #endif
+                return 1;
+              }
+            }else{
+              #ifdef MC_VERBOSE
+                XBT_VERB("Different global variable in libsimgrid : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+              #endif
+              return 1;
+            }
+           
+          }
+        } 
+        i++;
       }
-      pointer_align = (i / sizeof(void*)) * sizeof(void*);
-      addr_pointed1 = *((void **)((char *)d1 + pointer_align));
-      addr_pointed2 = *((void **)((char *)d2 + pointer_align));
-      if((addr_pointed1 > start_plt_libsimgrid && addr_pointed1 < end_plt_libsimgrid) || (addr_pointed2 > start_plt_libsimgrid && addr_pointed2 < end_plt_libsimgrid)){
-        continue;
-      }else if(addr_pointed1 >= raw_heap && addr_pointed1 <= end_raw_heap && addr_pointed2 >= raw_heap && addr_pointed2 <= end_raw_heap){
-        continue;
-      }else{
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
-          XBT_VERB("Different byte (offset=%zu) (%p - %p) in libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
-          XBT_VERB("Addresses pointed : %p - %p\n", addr_pointed1, addr_pointed2);
-        }
-        return 1;
+    }
+  }else{ /* binary */
+    xbt_dynar_foreach(mc_global_variables, cursor, current_var){
+      if(current_var->address > start_data_libsimgrid)
+        break;
+      offset = (char *)current_var->address - (char *)start_data_binary;
+      i = 0;
+      while(i < current_var->size){
+        if(memcmp((char*)d1 + offset + i, (char*)d2 + offset + i, 1) != 0){
+          pointer_align = (i / sizeof(void*)) * sizeof(void*); 
+          addr_pointed1 = *((void **)((char *)d1 + offset + pointer_align));
+          addr_pointed2 = *((void **)((char *)d2 + offset + pointer_align));
+          if((addr_pointed1 > start_plt_binary && addr_pointed1 < end_plt_binary) || (addr_pointed2 > start_plt_binary && addr_pointed2 < end_plt_binary)){
+            i = current_var->size;
+            continue;
+          }else{
+            if((addr_pointed1 > std_heap) && ((char *)addr_pointed1 < (char *)std_heap + STD_HEAP_SIZE) && (addr_pointed2 > std_heap) && ((char *)addr_pointed2 < (char *)std_heap + STD_HEAP_SIZE)){
+              res_compare = compare_area(addr_pointed1, addr_pointed2, NULL);
+              if(res_compare == 1){
+                #ifdef MC_VERBOSE
+                  XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+                #endif
+                return 1;
+              }
+            }else{
+              #ifdef MC_VERBOSE
+                XBT_VERB("Different global variable in binary : %s at addresses %p - %p (size = %zu)", current_var->name, (char *)d1+offset, (char *)d2+offset, current_var->size);
+              #endif
+              return 1;
+            }
+          }
+        } 
+        i++;
       }
+      
     }
   }
-  
+
   return 0;
 }
 
@@ -154,309 +156,360 @@ void stack_region_free_voidp(void *s){
 }
 
 static void heap_equality_free(heap_equality_t e){
-  if(e){
-    xbt_free(e);
-  }
+  xbt_free(e);
 }
 
 void heap_equality_free_voidp(void *e){
   heap_equality_free((heap_equality_t) * (void **) e);
 }
 
+int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall,
+                                   mc_snapshot_t s1, mc_snapshot_t s2){
+  return snapshot_compare(s1, s2);
+}
+
 int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
-  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  int raw_mem = (mmalloc_get_current_heap() == raw_heap);
   
   MC_SET_RAW_MEM;
-
-  int errors = 0, i = 0;
-
-  if(s1->num_reg != s2->num_reg){
-    if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose)){
-      XBT_VERB("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
-    }
-    return 1;
-  }
-
-  int heap_index = 0, data_libsimgrid_index = 0, data_program_index = 0;
-
-  /* Get index of regions */
-  while(i < s1->num_reg){
-    switch(s1->regions[i]->type){
-    case 0:
-      heap_index = i;
-      i++;
-      break;
-    case 1:
-      data_libsimgrid_index = i;
-      i++;
-      while( i < s1->num_reg && s1->regions[i]->type == 1)
-        i++;
-      break;
-    case 2:
-      data_program_index = i;
-      i++;
-      while( i < s1->num_reg && s1->regions[i]->type == 2)
-        i++;
-      break;
-    }
-  }
+     
+  int errors = 0;
 
   xbt_os_timer_t global_timer = xbt_os_timer_new();
   xbt_os_timer_t timer = xbt_os_timer_new();
 
   xbt_os_timer_start(global_timer);
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug))
+  #ifdef MC_DEBUG
     xbt_os_timer_start(timer);
-
-  /* Compare number of blocks/fragments used in each heap */
-  size_t chunks_used1 = mmalloc_get_chunks_used((xbt_mheap_t)s1->regions[heap_index]->data);
-  size_t chunks_used2 = mmalloc_get_chunks_used((xbt_mheap_t)s2->regions[heap_index]->data);
-  if(chunks_used1 != chunks_used2){
-    if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-      XBT_DEBUG("Different number of chunks used in each heap : %zu - %zu", chunks_used1, chunks_used2);
+  #endif
+
+  /* Compare number of processes */
+  if(s1->nb_processes != s2->nb_processes){
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+      mc_comp_times->nb_processes_comparison_time =  xbt_os_timer_elapsed(timer);
+      XBT_DEBUG("Different number of processes : %d - %d", s1->nb_processes, s2->nb_processes);
       errors++;
-    }else{
-      if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-        XBT_VERB("Different number of chunks used in each heap : %zu - %zu", chunks_used1, chunks_used2);
+    #else
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different number of processes : %d - %d", s1->nb_processes, s2->nb_processes);
+      #endif
      
       xbt_os_timer_free(timer);
       xbt_os_timer_stop(global_timer);
-      xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
       xbt_os_timer_free(global_timer);
 
-      if(!raw_mem_set)
+      if(!raw_mem)
         MC_UNSET_RAW_MEM;
 
       return 1;
-    }
+    #endif
   }
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->chunks_used_comparison_times, double, xbt_os_timer_elapsed(timer));
-
-    XBT_DEBUG("Chunks used comparison : %f", xbt_os_timer_elapsed(timer));
-    
+  #ifdef MC_DEBUG
     xbt_os_timer_start(timer);
-  }
+  #endif
+
+  /* Compare number of bytes used in each heap */
+  if(s1->heap_bytes_used != s2->heap_bytes_used){
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+      mc_comp_times->bytes_used_comparison_time = xbt_os_timer_elapsed(timer);
+      XBT_DEBUG("Different number of bytes used in each heap : %zu - %zu", s1->heap_bytes_used, s2->heap_bytes_used);
+      errors++;
+    #else
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different number of bytes used in each heap : %zu - %zu", s1->heap_bytes_used, s2->heap_bytes_used);
+      #endif
+
+      xbt_os_timer_free(timer);
+      xbt_os_timer_stop(global_timer);
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+      xbt_os_timer_free(global_timer);
 
+      if(!raw_mem)
+        MC_UNSET_RAW_MEM;
+
+      return 1;
+    #endif
+  }else{
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+    #endif
+  }
+  
+  #ifdef MC_DEBUG
+    xbt_os_timer_start(timer);
+  #endif
+  
   /* Compare size of stacks */
-  unsigned int cursor = 0;
-  void *addr_stack1, *addr_stack2;
-  void *sp1, *sp2;
+  int i = 0;
   size_t size_used1, size_used2;
-  while(cursor < xbt_dynar_length(stacks_areas)){
-    addr_stack1 = (char *)s1->regions[heap_index]->data + ((char *)((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->address - (char *)std_heap);
-    addr_stack2 = (char *)s2->regions[heap_index]->data + ((char *)((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->address - (char *)std_heap);
-    sp1 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
-    sp2 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
-    size_used1 = ((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->size - ((char*)sp1 - (char*)addr_stack1);
-    size_used2 = ((stack_region_t)xbt_dynar_get_as(stacks_areas, cursor, stack_region_t))->size - ((char*)sp2 - (char*)addr_stack2);
+  int is_diff = 0;
+  while(i < xbt_dynar_length(s1->stacks)){
+    size_used1 = s1->stack_sizes[i];
+    size_used2 = s2->stack_sizes[i];
     if(size_used1 != size_used2){
-      if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-        XBT_DEBUG("Different size used in stacks : %zu - %zu", size_used1, size_used2);
-        errors++;
-      }else{
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-          XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+    #ifdef MC_DEBUG
+      if(is_diff == 0){
+        xbt_os_timer_stop(timer);
+        mc_comp_times->stacks_sizes_comparison_time = xbt_os_timer_elapsed(timer);
+      }
+      XBT_DEBUG("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+      errors++;
+      is_diff = 1;
+    #else
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different size used in stacks : %zu - %zu", size_used1, size_used2);
+      #endif
  
-        xbt_os_timer_free(timer);
-        xbt_os_timer_stop(global_timer);
-        xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
-        xbt_os_timer_free(global_timer);
+      xbt_os_timer_free(timer);
+      xbt_os_timer_stop(global_timer);
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+      xbt_os_timer_free(global_timer);
 
-        if(!raw_mem_set)
-          MC_UNSET_RAW_MEM;
-        return 1;
-      }
+      if(!raw_mem)
+        MC_UNSET_RAW_MEM;
+
+      return 1;
+    #endif  
     }
-    cursor++;
+    i++;
   }
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->stacks_sizes_comparison_times, double, xbt_os_timer_elapsed(timer));
-
-    XBT_DEBUG("Stacks sizes comparison : %f", xbt_os_timer_elapsed(timer));
-    
+  #ifdef MC_DEBUG
+    if(is_diff == 0)
+      xbt_os_timer_stop(timer);
     xbt_os_timer_start(timer);
-  }
-
-  /* Compare program data segment(s) */
-  i = data_program_index;
-  while(i < s1->num_reg && s1->regions[i]->type == 2){
-    if(data_bss_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-      if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-        XBT_DEBUG("Different memcmp for data in program");
-        errors++;
-      }else{
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-          XBT_VERB("Different memcmp for data in program"); 
-
+  #endif
+
+  /* Compare hash of global variables */
+  if(s1->hash_global != NULL && s2->hash_global != NULL){
+    if(strcmp(s1->hash_global, s2->hash_global) != 0){
+      #ifdef MC_DEBUG
+        xbt_os_timer_stop(timer);
+        mc_comp_times->hash_global_variables_comparison_time = xbt_os_timer_elapsed(timer);
+        XBT_DEBUG("Different hash of global variables : %s - %s", s1->hash_global, s2->hash_global); 
+        errors++; 
+      #else
+        #ifdef MC_VERBOSE
+          XBT_VERB("Different hash of global variables : %s - %s", s1->hash_global, s2->hash_global); 
+        #endif
+    
         xbt_os_timer_free(timer);
         xbt_os_timer_stop(global_timer);
-        xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+        mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
         xbt_os_timer_free(global_timer);
-
-        if(!raw_mem_set)
+    
+        if(!raw_mem)
           MC_UNSET_RAW_MEM;
+
         return 1;
-      }
+      #endif
     }
-    i++;
   }
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->program_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
-
-    XBT_DEBUG("Program data segment comparison : %f", xbt_os_timer_elapsed(timer));
-    
+  #ifdef MC_DEBUG
     xbt_os_timer_start(timer);
-  }
-
-  /* Compare libsimgrid data segment(s) */
-  i = data_libsimgrid_index;
-  while(i < s1->num_reg && s1->regions[i]->type == 1){
-    if(data_bss_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
-      if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-        XBT_DEBUG("Different memcmp for data in libsimgrid");
-        errors++;
-      }else{
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-          XBT_VERB("Different memcmp for data in libsimgrid");
-         
+  #endif
+
+  /* Compare hash of local variables */
+  if(s1->hash_local != NULL && s2->hash_local != NULL){
+    if(strcmp(s1->hash_local, s2->hash_local) != 0){
+      #ifdef MC_DEBUG
+        xbt_os_timer_stop(timer);
+        mc_comp_times->hash_local_variables_comparison_time = xbt_os_timer_elapsed(timer);
+        XBT_DEBUG("Different hash of local variables : %s - %s", s1->hash_local, s2->hash_local); 
+        errors++; 
+      #else
+        #ifdef MC_VERBOSE
+          XBT_VERB("Different hash of local variables : %s - %s", s1->hash_local, s2->hash_local); 
+        #endif
+    
         xbt_os_timer_free(timer);
         xbt_os_timer_stop(global_timer);
-        xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+        mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
         xbt_os_timer_free(global_timer);
         
-        if(!raw_mem_set)
+        if(!raw_mem)
           MC_UNSET_RAW_MEM;
+        
         return 1;
-      }
+      #endif
     }
-    i++;
   }
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->libsimgrid_data_segment_comparison_times, double, xbt_os_timer_elapsed(timer));
-
-    XBT_DEBUG("Libsimgrid data segment comparison : %f", xbt_os_timer_elapsed(timer));
-    
+  #ifdef MC_DEBUG
     xbt_os_timer_start(timer);
-  }
-
-  /* Compare heap */
-  xbt_dynar_t stacks1 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
-  xbt_dynar_t stacks2 = xbt_dynar_new(sizeof(stack_region_t), stack_region_free_voidp);
-  xbt_dynar_t equals = xbt_dynar_new(sizeof(heap_equality_t), heap_equality_free_voidp);
-  
-  void *heap1 = s1->regions[heap_index]->data, *heap2 = s2->regions[heap_index]->data;
- 
-  if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[heap_index]->data, (xbt_mheap_t)s2->regions[heap_index]->data, &stacks1, &stacks2, &equals)){
-
-    if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-      XBT_DEBUG("Different heap (mmalloc_compare)");
-      errors++;
-    }else{
-
+  #endif
+
+  /* Init heap information used in heap comparison algorithm */
+  init_heap_information((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data, s1->to_ignore, s2->to_ignore);
+
+  /* Compare binary global variables */
+  is_diff = compare_global_variables(2, s1->regions[2]->data, s2->regions[2]->data);
+  if(is_diff != 0){
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+      mc_comp_times->binary_global_variables_comparison_time = xbt_os_timer_elapsed(timer);
+      XBT_DEBUG("Different global variables in binary"); 
+      errors++; 
+    #else
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different global variables in binary"); 
+      #endif
+    
+      reset_heap_information();
       xbt_os_timer_free(timer);
-      xbt_dynar_free(&stacks1);
-      xbt_dynar_free(&stacks2);
-      xbt_dynar_free(&equals);
- 
-      if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-        XBT_VERB("Different heap (mmalloc_compare)");
-       
       xbt_os_timer_stop(global_timer);
-      xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
       xbt_os_timer_free(global_timer);
-
-      if(!raw_mem_set)
+    
+      if(!raw_mem)
         MC_UNSET_RAW_MEM;
+
       return 1;
-    } 
+    #endif
   }
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->heap_comparison_times, double, xbt_os_timer_elapsed(timer));
-
-    XBT_DEBUG("Heap comparison : %f", xbt_os_timer_elapsed(timer));
-    
+  #ifdef MC_DEBUG
+    if(is_diff == 0)
+      xbt_os_timer_stop(timer);
     xbt_os_timer_start(timer);
-  }
+  #endif
+
+  /* Compare libsimgrid global variables */
+  is_diff = compare_global_variables(1, s1->regions[1]->data, s2->regions[1]->data);
+  if(is_diff != 0){
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+      mc_comp_times->libsimgrid_global_variables_comparison_time = xbt_os_timer_elapsed(timer); 
+      XBT_DEBUG("Different global variables in libsimgrid"); 
+      errors++; 
+    #else
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different global variables in libsimgrid"); 
+      #endif
+        
+      reset_heap_information();
+      xbt_os_timer_free(timer);
+      xbt_os_timer_stop(global_timer);
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+      xbt_os_timer_free(global_timer);
+    
+      if(!raw_mem)
+        MC_UNSET_RAW_MEM;
 
-  /* Stacks comparison */
-  cursor = 0;
-  stack_region_t stack_region1, stack_region2;
-  int diff = 0, diff_local = 0;
+      return 1;
+    #endif
+  }  
 
-  while(cursor < xbt_dynar_length(stacks1)){
-    stack_region1 = (stack_region_t)(xbt_dynar_get_as(stacks1, cursor, stack_region_t));
-    stack_region2 = (stack_region_t)(xbt_dynar_get_as(stacks2, cursor, stack_region_t));
-    sp1 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
-    sp2 = ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->stack_pointer;
-    diff = compare_stack(stack_region1, stack_region2, sp1, sp2, heap1, heap2, equals);
+  #ifdef MC_DEBUG
+    if(is_diff == 0)
+      xbt_os_timer_stop(timer);
+    xbt_os_timer_start(timer);
+  #endif
 
-    if(diff > 0){ /* Differences may be due to padding */  
-      diff_local = compare_local_variables(((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, equals);
+    /* Stacks comparison */
+    unsigned int  cursor = 0;
+    int diff_local = 0;
+    is_diff = 0;
+    
+    while(cursor < xbt_dynar_length(s1->stacks)){
+      diff_local = compare_local_variables(((mc_snapshot_stack_t)xbt_dynar_get_as(s1->stacks, cursor, mc_snapshot_stack_t))->local_variables->data, ((mc_snapshot_stack_t)xbt_dynar_get_as(s2->stacks, cursor, mc_snapshot_stack_t))->local_variables->data);
       if(diff_local > 0){
-        if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
+        #ifdef MC_DEBUG
+          if(is_diff == 0){
+            xbt_os_timer_stop(timer);
+            mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer); 
+          }
           XBT_DEBUG("Different local variables between stacks %d", cursor + 1);
           errors++;
-        }else{
-          xbt_dynar_free(&stacks1);
-          xbt_dynar_free(&stacks2);
-          xbt_dynar_free(&equals);
-
-          if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
+          is_diff = 1;
+        #else
+        
+          #ifdef MC_VERBOSE
             XBT_VERB("Different local variables between stacks %d", cursor + 1);
+          #endif
           
-          xbt_os_timer_free(timer);
-          xbt_os_timer_stop(global_timer);
-          xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
-          xbt_os_timer_free(global_timer);
-          
-          if(!raw_mem_set)
-            MC_UNSET_RAW_MEM;
-
-          return 1;
-        }
+            reset_heap_information();
+            xbt_os_timer_free(timer);
+            xbt_os_timer_stop(global_timer);
+            mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+            xbt_os_timer_free(global_timer);
+            
+            if(!raw_mem)
+              MC_UNSET_RAW_MEM;
+            
+            return 1;
+        #endif
       }
+      cursor++;
     }
-    cursor++;
-  }
+    
+    #ifdef MC_DEBUG
+      xbt_os_timer_start(timer);
+    #endif
 
-  xbt_dynar_free(&stacks1);
-  xbt_dynar_free(&stacks2);
-  xbt_dynar_free(&equals);
+  /* Compare heap */
+ 
+  if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[0]->data, (xbt_mheap_t)s2->regions[0]->data)){
 
-  if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_debug)){
-    xbt_os_timer_stop(timer);
-    xbt_dynar_push_as(initial_state_liveness->stacks_comparison_times, double, xbt_os_timer_elapsed(timer));
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+      mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer); 
+      XBT_DEBUG("Different heap (mmalloc_compare)");
+      errors++;
+    #else
 
-    XBT_DEBUG("Stacks comparison : %f", xbt_os_timer_elapsed(timer));
-    
-    xbt_os_timer_free(timer);
+      xbt_os_timer_free(timer);
+ 
+      #ifdef MC_VERBOSE
+        XBT_VERB("Different heap (mmalloc_compare)");
+      #endif
+       
+      reset_heap_information();
+      xbt_os_timer_stop(global_timer);
+      mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+      xbt_os_timer_free(global_timer);
+
+      if(!raw_mem)
+        MC_UNSET_RAW_MEM;
+
+      return 1;
+    #endif
+  }else{
+    #ifdef MC_DEBUG
+      xbt_os_timer_stop(timer);
+    #endif
   }
 
-  xbt_os_timer_stop(global_timer);
-  xbt_dynar_push_as(initial_state_liveness->snapshot_comparison_times, double, xbt_os_timer_elapsed(timer));
+  reset_heap_information();
+   
+  xbt_os_timer_free(timer);
+
+  #ifdef MC_VERBOSE
+    xbt_os_timer_stop(global_timer);
+    mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer);
+  #endif
+
   xbt_os_timer_free(global_timer);
 
-  if(!raw_mem_set)
+  #ifdef MC_DEBUG
+    print_comparison_times();
+  #endif
+
+  if(!raw_mem)
     MC_UNSET_RAW_MEM;
 
   return errors > 0;
   
 }
 
-static int is_stack_ignore_variable(char *frame, char *var_name){
+int is_stack_ignore_variable(char *frame, char *var_name){
 
   unsigned int cursor = 0;
   int start = 0;
@@ -466,24 +519,24 @@ static int is_stack_ignore_variable(char *frame, char *var_name){
   while(start <= end){
     cursor = (start + end) / 2;
     current_var = (mc_stack_ignore_variable_t)xbt_dynar_get_as(mc_stack_comparison_ignore, cursor, mc_stack_ignore_variable_t);
-    if(strcmp(current_var->frame, frame) == 0){
+    if(strcmp(current_var->frame, frame) == 0 || strcmp(current_var->frame, "*") == 0){
       if(strcmp(current_var->var_name, var_name) == 0)
         return 1;
       if(strcmp(current_var->var_name, var_name) < 0)
         start = cursor + 1;
       if(strcmp(current_var->var_name, var_name) > 0)
         end = cursor - 1;
-    }
-  if(strcmp(current_var->frame, frame) < 0)
+    }else if(strcmp(current_var->frame, frame) < 0){
       start = cursor + 1;
-  if(strcmp(current_var->frame, frame) > 0)
+    }else if(strcmp(current_var->frame, frame) > 0){
       end = cursor - 1; 
+    }
   }
 
   return 0;
 }
 
-static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals){
+static int compare_local_variables(char *s1, char *s2){
   
   xbt_dynar_t tokens1 = xbt_str_split(s1, NULL);
   xbt_dynar_t tokens2 = xbt_str_split(s2, NULL);
@@ -491,42 +544,79 @@ static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals){
   xbt_dynar_t s_tokens1, s_tokens2;
   unsigned int cursor = 0;
   void *addr1, *addr2;
-  char *ip1 = NULL, *ip2 = NULL;
-  
+  char *frame_name1 = NULL, *frame_name2 = NULL;
+  int res_compare = 0;
+
+  #ifdef MC_VERBOSE
+    char *var_name;
+  #endif
+
   while(cursor < xbt_dynar_length(tokens1)){
     s_tokens1 = xbt_str_split(xbt_dynar_get_as(tokens1, cursor, char *), "=");
     s_tokens2 = xbt_str_split(xbt_dynar_get_as(tokens2, cursor, char *), "=");
     if(xbt_dynar_length(s_tokens1) > 1 && xbt_dynar_length(s_tokens2) > 1){
-      if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "ip") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "ip") == 0)){
-        ip1 = strdup(xbt_dynar_get_as(s_tokens1, 1, char *));
-        ip2 = strdup(xbt_dynar_get_as(s_tokens2, 1, char *));
-        /*if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-          XBT_VERB("Instruction pointer : %s, Instruction pointer : %s", ip1, ip2);*/
+      #ifdef MC_VERBOSE
+        var_name = xbt_dynar_get_as(s_tokens1, 0, char *);
+      #endif
+      if((strcmp(xbt_dynar_get_as(s_tokens1, 0, char *), "frame_name") == 0) && (strcmp(xbt_dynar_get_as(s_tokens2, 0, char *), "frame_name") == 0)){
+        xbt_free(frame_name1);
+        xbt_free(frame_name2);
+        frame_name1 = strdup(xbt_dynar_get_as(s_tokens1, 1, char *));
+        frame_name2 = strdup(xbt_dynar_get_as(s_tokens2, 1, char *));
       }
-      if(strcmp(xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)) != 0){   
-        /* Ignore this variable ?  */
-        if(is_stack_ignore_variable(ip1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(ip2, xbt_dynar_get_as(s_tokens2, 0, char *))){
-          xbt_dynar_free(&s_tokens1);
-          xbt_dynar_free(&s_tokens2);
-          cursor++;
-          continue;
+      addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16);
+      addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
+      if(addr1 > std_heap && (char *)addr1 <= (char *)std_heap + STD_HEAP_SIZE && addr2 > std_heap && (char *)addr2 <= (char *)std_heap + STD_HEAP_SIZE){
+        res_compare = compare_area(addr1, addr2, NULL);
+        if(res_compare == 1){
+          if(is_stack_ignore_variable(frame_name1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(frame_name2, xbt_dynar_get_as(s_tokens2, 0, char *))){
+            xbt_dynar_free(&s_tokens1);
+            xbt_dynar_free(&s_tokens2);
+            cursor++;
+            continue;
+          }else {
+            #ifdef MC_VERBOSE
+              XBT_VERB("Different local variable : %s at addresses %p - %p", var_name, addr1, addr2);
+            #endif
+            xbt_dynar_free(&s_tokens1);
+            xbt_dynar_free(&s_tokens2);
+            xbt_dynar_free(&tokens1);
+            xbt_dynar_free(&tokens2);
+            xbt_free(frame_name1);
+            xbt_free(frame_name2);
+            return 1;
+          }
         }
-        addr1 = (void *) strtoul(xbt_dynar_get_as(s_tokens1, 1, char *), NULL, 16);
-        addr2 = (void *) strtoul(xbt_dynar_get_as(s_tokens2, 1, char *), NULL, 16);
-        if(is_heap_equality(heap_equals, addr1, addr2) == 0){
-          if(XBT_LOG_ISENABLED(mc_compare, xbt_log_priority_verbose))
-            XBT_VERB("Variable %s is different between stacks : %s - %s", xbt_dynar_get_as(s_tokens1, 0, char *), xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
-          xbt_dynar_free(&s_tokens1);
-          xbt_dynar_free(&s_tokens2);
-          return 1;
+      }else{
+        if(strcmp(xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *)) != 0){
+          if(is_stack_ignore_variable(frame_name1, xbt_dynar_get_as(s_tokens1, 0, char *)) && is_stack_ignore_variable(frame_name2, xbt_dynar_get_as(s_tokens2, 0, char *))){
+            xbt_dynar_free(&s_tokens1);
+            xbt_dynar_free(&s_tokens2);
+            cursor++;
+            continue;
+          }else {
+            #ifdef MC_VERBOSE
+              XBT_VERB("Different local variable : %s (%s - %s)", var_name, xbt_dynar_get_as(s_tokens1, 1, char *), xbt_dynar_get_as(s_tokens2, 1, char *));
+            #endif
+            xbt_dynar_free(&s_tokens1);
+            xbt_dynar_free(&s_tokens2);
+            xbt_dynar_free(&tokens1);
+            xbt_dynar_free(&tokens2);
+            xbt_free(frame_name1);
+            xbt_free(frame_name2);
+            return 1;
+          }
         }
       }
     }
     xbt_dynar_free(&s_tokens1);
     xbt_dynar_free(&s_tokens2);
+         
     cursor++;
   }
 
+  xbt_free(frame_name1);
+  xbt_free(frame_name2);
   xbt_dynar_free(&tokens1);
   xbt_dynar_free(&tokens2);
   return 0;
@@ -561,39 +651,21 @@ static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2){
 
 }
 
-
-static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *sp2, void *heap1, void *heap2, xbt_dynar_t equals){
-  
-  size_t k = 0;
-  size_t size_used1 = s1->size - ((char*)sp1 - (char*)s1->address);
-  size_t size_used2 = s2->size - ((char*)sp2 - (char*)s2->address);
-
-  int pointer_align;
-  void *addr_pointed1 = NULL, *addr_pointed2 = NULL;  
-  
-  while(k < size_used1){
-    if(memcmp((char *)s1->address + s1->size - k, (char *)s2->address + s2->size - k, 1) != 0){
-      pointer_align = ((size_used1 - k) / sizeof(void*)) * sizeof(void*);
-      addr_pointed1 = *((void **)(((char*)s1->address + (s1->size - size_used1)) + pointer_align));
-      addr_pointed2 = *((void **)(((char*)s2->address + (s2->size - size_used2)) + pointer_align));
-      if(is_heap_equality(equals, addr_pointed1, addr_pointed2) == 0){
-        if((addr_pointed1 > std_heap) && (addr_pointed1 < (void *)((char *)std_heap + STD_HEAP_SIZE)) && (addr_pointed2 > std_heap) && (addr_pointed2 < (void *)((char *)std_heap + STD_HEAP_SIZE))){
-          if(is_free_area(addr_pointed1, (xbt_mheap_t)heap1) == 0 || is_free_area(addr_pointed2, (xbt_mheap_t)heap2) == 0){
-            return 1;
-          }
-        }else{
-          return 1;
-        } 
-      }
-    } 
-    k++;
-  }
- 
-  return 0;
-}
-
 int MC_compare_snapshots(void *s1, void *s2){
+  
+  MC_ignore_stack("self", "simcall_BODY_mc_snapshot");
 
   return simcall_mc_compare_snapshots(s1, s2);
 
 }
+
+void print_comparison_times(){
+  XBT_DEBUG("*** Comparison times ***");
+  XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time);
+  XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time);
+  XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time);
+  XBT_DEBUG("- Binary global variables : %f", mc_comp_times->binary_global_variables_comparison_time);
+  XBT_DEBUG("- Libsimgrid global variables : %f", mc_comp_times->libsimgrid_global_variables_comparison_time);
+  XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time);
+  XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time);
+}