X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/a326f3588402d8813b4556d92e9266c9ed10215b..0e17ea09090a41fb603dd6fc5f8088db1878cb9b:/src/xbt/mmalloc/mm_diff.c?ds=sidebyside

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index a6da0077ea..efec23cec3 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -15,7 +15,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
 
 extern char *xbt_binary_name;
 
-xbt_dynar_t mmalloc_ignore;
+xbt_dynar_t mc_comparison_ignore;
 xbt_dynar_t stacks_areas;
 
 static void heap_area_pair_free(heap_area_pair_t pair);
@@ -27,7 +27,7 @@ static heap_area_t new_heap_area(int block, int fragment);
 static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous, int check_ignore);
 static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals);
 
-static int in_mmalloc_ignore(int block, int fragment);
+static int in_mc_comparison_ignore(int block, int fragment);
 static size_t heap_comparison_ignore(void *address);
 static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2);
 static void remove_heap_equality(xbt_dynar_t *equals, int address, void *a);
@@ -39,7 +39,7 @@ void mmalloc_backtrace_block_display(void* heapinfo, int block){
   xbt_ex_t e;
 
   if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) {
-    XBT_DEBUG("No backtrace available for that block, sorry.");
+    fprintf(stderr, "No backtrace available for that block, sorry.\n");
     return;
   }
 
@@ -48,15 +48,15 @@ void mmalloc_backtrace_block_display(void* heapinfo, int block){
 
   xbt_ex_setup_backtrace(&e);
   if (e.used == 0) {
-    XBT_DEBUG("(backtrace not set)");
+    fprintf(stderr, "(backtrace not set)\n");
   } else if (e.bt_strings == NULL) {
-    XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+    fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
   } else {
     int i;
 
-    XBT_DEBUG("Backtrace of where the block %d was malloced (%d frames):", block ,e.used);
+    fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
-      XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
+      fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4);
     }
   }
 
@@ -71,20 +71,51 @@ void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){
 
   xbt_ex_setup_backtrace(&e);
   if (e.used == 0) {
-    XBT_DEBUG("(backtrace not set)");
+    fprintf(stderr, "(backtrace not set)\n");
   } else if (e.bt_strings == NULL) {
-    XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+    fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
   } else {
     int i;
 
-    XBT_DEBUG("Backtrace of where the fragment %d in block %d was malloced (%d frames):", frag, block ,e.used);
+    fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used);
     for (i = 0; i < e.used; i++)       /* no need to display "xbt_backtrace_display" */{
-      XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
+      fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4);
     }
   }
 
 }
 
+void mmalloc_backtrace_display(void *addr){
+
+  size_t block, frag_nb;
+  int type;
+  
+  xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+  block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1);
+
+  type = heap->heapinfo[block].type;
+
+  switch(type){
+  case -1 : /* Free block */
+    fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n");
+    xbt_abort();
+    break; 
+  case 0: /* Large block */
+    mmalloc_backtrace_block_display(heap->heapinfo, block);
+    break;
+  default: /* Fragmented block */
+    frag_nb = RESIDUAL(addr, BLOCKSIZE) >> type;
+    if(heap->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){
+      fprintf(stderr , "Asked to display the backtrace of a fragment that is free. I'm puzzled\n");
+      xbt_abort();
+    }
+    mmalloc_backtrace_fragment_display(heap->heapinfo, block, frag_nb);
+    break;
+  }
+
+}
+
 
 void *s_heap, *heapbase1, *heapbase2;
 malloc_info *heapinfo1, *heapinfo2;
@@ -204,11 +235,11 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
         continue;
       }
 
-      if(heapinfo1[i1].busy_block.equal_to != NULL){         
+      if(heapinfo1[i1].busy_block.equal_to != NULL){
         i1++;
         continue;
       }
-      
+    
       i2 = 1;
       equal = 0;
   
@@ -220,7 +251,6 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
           if(heapinfo1[current_block].busy_block.busy_size == heapinfo2[current_block].busy_block.busy_size){
 
             addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2));
-
             real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2);
           
             if((stack_name = is_stack(real_addr_block2)) != NULL){
@@ -233,8 +263,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
         
             add_heap_area_pair(previous, current_block, -1, current_block, -1);
         
-            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-              if(in_mmalloc_ignore((int)current_block, -1))
+            if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+              if(in_mc_comparison_ignore((int)current_block, -1))
                 res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 1);
               else
                 res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0);
@@ -262,8 +292,7 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
 
       while(i2 <= heaplimit && !equal){
 
-        addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));
-        
+        addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));        
         real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2);
         
         if((stack_name = is_stack(real_addr_block2)) != NULL){
@@ -302,8 +331,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
         /* Comparison */
         add_heap_area_pair(previous, i1, -1, i2, -1);
         
-        if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-          if(in_mmalloc_ignore((int)i1, -1))
+        if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+          if(in_mc_comparison_ignore((int)i1, -1))
             res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 1);
           else
             res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0);
@@ -336,10 +365,10 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
 
         current_fragment = j1;
 
-        if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */
+        if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */
           continue;
-        
-        if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL)                
+
+        if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL)
           continue;
 
         addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].type));
@@ -359,8 +388,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
                
                 add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment);
             
-                if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-                  if(in_mmalloc_ignore((int)current_block, (int)current_fragment))
+                if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+                  if(in_mc_comparison_ignore((int)current_block, (int)current_fragment))
                     res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 1);
                   else
                     res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0);
@@ -406,8 +435,8 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stac
             /* Comparison */
             add_heap_area_pair(previous, i1, j1, i2, j2);
             
-            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-              if(in_mmalloc_ignore((int)i1, (int)j1))
+            if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+              if(in_mc_comparison_ignore((int)i1, (int)j1))
                 res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 1);
               else
                 res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 0);
@@ -524,16 +553,16 @@ static heap_area_t new_heap_area(int block, int fragment){
   return area;
 }
 
-static int in_mmalloc_ignore(int block, int fragment){
+static int in_mc_comparison_ignore(int block, int fragment){
 
   unsigned int cursor = 0;
   int start = 0;
-  int end = xbt_dynar_length(mmalloc_ignore) - 1;
+  int end = xbt_dynar_length(mc_comparison_ignore) - 1;
   mc_ignore_region_t region;
 
   while(start <= end){
     cursor = (start + end) / 2;
-    region = (mc_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t);
+    region = (mc_ignore_region_t)xbt_dynar_get_as(mc_comparison_ignore, cursor, mc_ignore_region_t);
     if(region->block == block){
       if(region->fragment == fragment)
         return 1;
@@ -554,12 +583,12 @@ static int in_mmalloc_ignore(int block, int fragment){
 static size_t heap_comparison_ignore(void *address){
   unsigned int cursor = 0;
   int start = 0;
-  int end = xbt_dynar_length(mmalloc_ignore) - 1;
+  int end = xbt_dynar_length(mc_comparison_ignore) - 1;
   mc_ignore_region_t region;
 
   while(start <= end){
     cursor = (start + end) / 2;
-    region = (mc_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t);
+    region = (mc_ignore_region_t)xbt_dynar_get_as(mc_comparison_ignore, cursor, mc_ignore_region_t);
     if(region->address == address)
       return region->size;
     if(region->address < address)
@@ -628,8 +657,8 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ
 
           if(add_heap_area_pair(previous, block_pointed1, -1, block_pointed2, -1)){
 
-            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-              if(in_mmalloc_ignore(block_pointed1, -1))
+            if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+              if(in_mc_comparison_ignore(block_pointed1, -1))
                 res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 1);
               else
                 res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 0);
@@ -656,8 +685,8 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ
 
           if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){
 
-            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-              if(in_mmalloc_ignore(block_pointed1, frag_pointed1))
+            if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+              if(in_mc_comparison_ignore(block_pointed1, frag_pointed1))
                 res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1);
               else
                 res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
@@ -690,8 +719,8 @@ static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previ
 
           if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){
 
-            if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
-              if(in_mmalloc_ignore(block_pointed1, frag_pointed1))
+            if(ignore_done < xbt_dynar_length(mc_comparison_ignore)){
+              if(in_mc_comparison_ignore(block_pointed1, frag_pointed1))
                 res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1);
               else
                 res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
@@ -1061,4 +1090,36 @@ static void remove_heap_equality(xbt_dynar_t *equals, int address, void *a){
   }
 
   
+}
+
+int is_free_area(void *area, xbt_mheap_t heap){
+
+  void *sheap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
+  malloc_info *heapinfo = (malloc_info *)((char *)heap + ((uintptr_t)((char *)heap->heapinfo - (char *)sheap)));
+  size_t heapsize = heap->heapsize;
+
+  /* Get block number */ 
+  size_t block = ((char*)area - (char*)((xbt_mheap_t)sheap)->heapbase) / BLOCKSIZE + 1;
+  size_t fragment;
+
+  /* Check if valid block number */
+  if((char *)area < (char*)((xbt_mheap_t)sheap)->heapbase || block > heapsize || block < 1)
+    return 0;
+
+  if(heapinfo[block].type < 0)
+    return 1;
+
+  if(heapinfo[block].type == 0)
+    return 0;
+
+  if(heapinfo[block].type > 0){
+    fragment = ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type;
+    if(heapinfo[block].busy_frag.frag_size[fragment] == 0)
+      return 1;  
+  }
+
+  return 0;
+  
+
+
 }