X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/7c4cc145c41e6f4e0b7841c84d780074a04b6f35..652f5c53fc94cd105af2c2d46b10e7d19abdf274:/src/mc/mc_compare.c

diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c
index 1ca61f0b7a..083301b17f 100644
--- a/src/mc/mc_compare.c
+++ b/src/mc/mc_compare.c
@@ -18,6 +18,9 @@ static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *
 static int is_heap_equality(xbt_dynar_t equals, void *a1, void *a2);
 static size_t ignore(void *address);
 
+static void stack_region_free(stack_region_t s);
+static void heap_equality_free(heap_equality_t e);
+
 static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals);
 
 static size_t ignore(void *address){
@@ -43,15 +46,24 @@ static size_t ignore(void *address){
 static int data_program_region_compare(void *d1, void *d2, size_t size){
   int distance = 0;
   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){
-      XBT_DEBUG("Different byte (offset=%zu) (%p - %p) in data program region", i, (char *)d1 + i, (char *)d2 + i);
-      distance++;
+      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{
+        XBT_DEBUG("Different byte (offset=%zu) (%p - %p) in data program region", i, (char *)d1 + i, (char *)d2 + i);
+        distance++;
+      }
     }
   }
   
-  XBT_DEBUG("Hamming distance between data program regions : %d", distance);
+  XBT_INFO("Hamming distance between data program regions : %d", distance);
 
   return distance;
 }
@@ -71,7 +83,9 @@ static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
       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 && addr_pointed1 < end_plt) || (addr_pointed2 > start_plt && addr_pointed2 < end_plt)){
+      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{
         XBT_DEBUG("Different byte (offset=%zu) (%p - %p) in data libsimgrid region", i, (char *)d1 + i, (char *)d2 + i);
@@ -81,7 +95,7 @@ static int data_libsimgrid_region_compare(void *d1, void *d2, size_t size){
     }
   }
   
-  XBT_DEBUG("Hamming distance between data libsimgrid regions : %d", distance); fflush(NULL);
+  XBT_INFO("Hamming distance between data libsimgrid regions : %d", distance); fflush(NULL);
   
   return distance;
 }
@@ -98,29 +112,54 @@ static int heap_region_compare(void *d1, void *d2, size_t size){
     }
   }
   
-  XBT_DEBUG("Hamming distance between heap regions : %d (total size : %zu)", distance, size);
+  XBT_INFO("Hamming distance between heap regions : %d (total size : %zu)", distance, size);
 
   return distance;
 }
 
+static void stack_region_free(stack_region_t s){
+  if(s){
+    xbt_free(s->process_name);
+    xbt_free(s);
+  }
+}
+
+void stack_region_free_voidp(void *s){
+  stack_region_free((stack_region_t) * (void **) s);
+}
+
+static void heap_equality_free(heap_equality_t e){
+  if(e){
+    xbt_free(e);
+  }
+}
+
+void heap_equality_free_voidp(void *e){
+  heap_equality_free((heap_equality_t) * (void **) e);
+}
+
 int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
 
+  raw_mem_set = (mmalloc_get_current_heap() == raw_heap);
+  
+  MC_SET_RAW_MEM;
+
   int errors = 0, i;
-  xbt_dynar_t stacks1 = xbt_dynar_new(sizeof(stack_region_t), NULL);
-  xbt_dynar_t stacks2 = xbt_dynar_new(sizeof(stack_region_t), NULL);
-  xbt_dynar_t equals = xbt_dynar_new(sizeof(heap_equality_t), NULL);
+  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 = NULL, *heap2 = NULL;
   
   if(s1->num_reg != s2->num_reg){
-    XBT_INFO("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
+    XBT_DEBUG("Different num_reg (s1 = %u, s2 = %u)", s1->num_reg, s2->num_reg);
     return 1;
   }
 
   for(i=0 ; i< s1->num_reg ; i++){
     
     if(s1->regions[i]->type != s2->regions[i]->type){
-      XBT_INFO("Different type of region");
+      XBT_DEBUG("Different type of region");
       errors++;
     }
     
@@ -128,15 +167,30 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 0 :
       /* Compare heapregion */
       if(s1->regions[i]->size != s2->regions[i]->size){
-        XBT_INFO("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        XBT_DEBUG("Different size of heap (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-        XBT_INFO("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        XBT_DEBUG("Different start addr of heap (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(mmalloc_compare_heap((xbt_mheap_t)s1->regions[i]->data, (xbt_mheap_t)s2->regions[i]->data, &stacks1, &stacks2, &equals)){
         XBT_INFO("Different heap (mmalloc_compare)");
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;  
         return 1; 
       }
       heap1 = s1->regions[i]->data;
@@ -145,15 +199,30 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 1 :
       /* Compare data libsimgrid region */
       if(s1->regions[i]->size != s2->regions[i]->size){
-        XBT_INFO("Different size of libsimgrid (data) (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        XBT_DEBUG("Different size of libsimgrid (data) (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-        XBT_INFO("Different start addr of libsimgrid (data) (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        XBT_DEBUG("Different start addr of libsimgrid (data) (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(data_libsimgrid_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
         XBT_INFO("Different memcmp for data in libsimgrid");
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       break;
@@ -161,15 +230,30 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     case 2 :
       /* Compare data program region */
       if(s1->regions[i]->size != s2->regions[i]->size){
-        XBT_INFO("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        XBT_DEBUG("Different size of data program (s1 = %zu, s2 = %zu)", s1->regions[i]->size, s2->regions[i]->size);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(s1->regions[i]->start_addr != s2->regions[i]->start_addr){
-        XBT_INFO("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        XBT_DEBUG("Different start addr of data program (s1 = %p, s2 = %p)", s1->regions[i]->start_addr, s2->regions[i]->start_addr);
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       if(data_program_region_compare(s1->regions[i]->data, s2->regions[i]->data, s1->regions[i]->size) != 0){
         XBT_INFO("Different memcmp for data in program");
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }
       break;
@@ -179,14 +263,13 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
   }
 
   /* Stacks comparison */
-  unsigned int cursor = 1, cursor2 = 0;
+  unsigned int cursor = 0;
   stack_region_t stack_region1, stack_region2;
   void *sp1, *sp2;
   int diff = 0, diff_local = 0;
-  heap_equality_t equality;
 
   while(cursor < xbt_dynar_length(stacks1)){
-    XBT_INFO("Stack %d", cursor + 1); 
+    XBT_DEBUG("Stack %d", cursor + 1); 
     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;
@@ -196,17 +279,27 @@ int snapshot_compare(mc_snapshot_t s1, mc_snapshot_t s2){
     if(diff >0){  
       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);
       if(diff_local > 0){
-        XBT_INFO("Hamming distance between stacks : %d", diff);
+        XBT_INFO("Different local variables between stacks");
+        xbt_dynar_free(&stacks1);
+        xbt_dynar_free(&stacks2);
+        xbt_dynar_free(&equals);
+        if(!raw_mem_set)
+          MC_UNSET_RAW_MEM;
         return 1;
       }else{
         XBT_INFO("Local variables are equals in stack %d", cursor + 1);
       }
     }else{
-      XBT_INFO("Same stacks");
+      XBT_INFO("Hamming distance between stacks : %d", diff);
     }
     cursor++;
   }
 
+  xbt_dynar_free(&stacks1);
+  xbt_dynar_free(&stacks2);
+  xbt_dynar_free(&equals);
+  if(!raw_mem_set)
+    MC_UNSET_RAW_MEM;
   return 0;
   
 }
@@ -235,9 +328,13 @@ static int compare_local_variables(char *s1, char *s2, xbt_dynar_t heap_equals){
         }
       }
     }
+    xbt_dynar_free(&s_tokens1);
+    xbt_dynar_free(&s_tokens2);
     cursor++;
   }
 
+  xbt_dynar_free(&tokens1);
+  xbt_dynar_free(&tokens2);
   return diff;
   
 }
@@ -309,3 +406,4 @@ static int compare_stack(stack_region_t s1, stack_region_t s2, void *sp1, void *
 
   return nb_diff;
 }
+