X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d2ef882f0df05a18a9e92abce9caa7ca25b8b9f8..8cce4677bbae8649654b26c7a43012c058dfd5d2:/src/xbt/mmalloc/mm_diff.c

diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c
index 63b24c3eb6..6e54a5d2f1 100644
--- a/src/xbt/mmalloc/mm_diff.c
+++ b/src/xbt/mmalloc/mm_diff.c
@@ -112,20 +112,20 @@ void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t fr
   }
 }
 
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void* s_heap, void* r_heap){
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
 
   if(mdp1 == NULL && mdp2 == NULL){
     fprintf(stderr, "Malloc descriptors null\n");
     return 0;
   }
 
-  int errors = mmalloc_compare_mdesc(mdp1, mdp2, s_heap, r_heap);
+  int errors = mmalloc_compare_mdesc(mdp1, mdp2);
 
   return (errors > 0);
 
 }
 
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap, void* r_heap){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
 
   int errors = 0;
 
@@ -194,17 +194,35 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
     return 1;
     }*/
 
+  //void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
+  //void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_heap);
+
+  xbt_mheap_t s_heap = mmalloc_get_current_heap();
+    
+  void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
+  void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
+
   size_t i, j;
   void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
-  size_t frag_size;
+  size_t frag_size = 0;         /* FIXME: arbitrary initialization */
+  /* size_t frag_size_pointed; FIXME: unused */
 
-  i = 0;
+  i = 1;
 
   int k;
   int distance = 0;
+  int total_distance = 0;
+
+  void *end_heap = get_end_addr_heap(s_heap);
+
   int pointer_align;
+  void *address_pointed1, *address_pointed2;
+
+  int block_pointed1, block_pointed2;
+  void *addr_block_pointed1, *addr_block_pointed2;
+  int frag_pointed1, frag_pointed2;
+
 
-  char *pointed_address1 = NULL, *pointed_address2 = NULL;
 
   /* Check busy blocks*/
 
@@ -215,79 +233,143 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
       errors++;
     }
 
-    addr_block1 = (char *)mdp1 + mdp1->headersize + ((i-1) * BLOCKSIZE);
-    addr_block2 = (char *)mdp2 + mdp2->headersize + ((i-1) * BLOCKSIZE); 
+    //fprintf(stderr, "i = %zu, type = %d", i, mdp1->heapinfo[i].type);
+
+    //addr_block1 = (void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1);
+    //addr_block2 = (void*) (((ADDR2UINT(1)) - 1) * BLOCKSIZE + (char*)heapbase2);
+
+    addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
+    addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
 
     if(mdp1->heapinfo[i].type == 0){ /* busy large block */
 
       if(mdp1->heapinfo[i].busy_block.size != mdp2->heapinfo[i].busy_block.size){
-	fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.size, mdp2->heapinfo[i].busy_block.size);
+	fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.size, mdp2->heapinfo[i].busy_block.size); 
+	fflush(NULL);
 	errors++;
       } 
 
       if(mdp1->heapinfo[i].busy_block.busy_size != mdp2->heapinfo[i].busy_block.busy_size){
-	fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size);
+	fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size); 
+	fflush(NULL);
 	errors++;
       } 
 
-      //if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.size)) != 0){
-      if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.busy_size)) != 0){
-	fprintf(stderr,"\nDifferent data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, mdp1->heapinfo[i].busy_block.size, mdp1->heapinfo[i].busy_block.busy_size);
-
-	/* Hamming distance on different blocks */
-	distance = 0;
-	//for(k=0;k<mdp1->heapinfo[i].busy_block.size;k++){
-	for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
-	  if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
-	    fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); 
-	    distance++;
-	    pointer_align = (k / sizeof(void*)) * sizeof(void*); 
-	    pointed_address1 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_block1 + pointer_align)), s_heap, r_heap));
-	    pointed_address2 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_block2 + pointer_align)), s_heap, r_heap));
-	    fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_block1 + pointer_align)), pointed_address1, *((void **)((char *)addr_block2 + pointer_align)), pointed_address2);
-	    if((strcmp(pointed_address1, pointed_address2) == 0) && (strcmp(pointed_address1, "std_heap") == 0)){
-	      /* FIXME : compare value pointed thanks to DWARF */
+  
+      /* Hamming distance on different blocks */
+      distance = 0;
+
+      //for(k=0;k<mdp1->heapinfo[i].busy_block.size * BLOCKSIZE;k++){
+      for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
+	if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
+	  //fprintf(stderr, "Different byte (offset=%d) (%p - %p) in block %zu\n", k, (char *)addr_block1 + k, (char *)addr_block2 + k, i); fflush(NULL);
+	  pointer_align = (k / sizeof(void*)) * sizeof(void*); 
+	  address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
+	  address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));				   
+	  if(((address_pointed1 > (void *)s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < end_heap))){
+	    block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+	    block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+	    //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
+	    if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+	      if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+		while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
+		  block_pointed1--;
+		while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
+		  block_pointed2--;
+		if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+		  //addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+		  //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+		  addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
+		  addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+		  
+		  fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
+		  if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+		    distance++;
+		  }else{
+		    fprintf(stderr, "False difference detected\n");
+		  }
+		}else{
+		  distance++;
+		}
+	      }else{ // Fragmented block
+		address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
+		address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+		//addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+		//addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+		addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
+		addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+		frag_pointed1 = 0;
+		while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 +1 ) * frag_size))){
+		  frag_pointed1++;
+		}
+		frag_pointed2 = 0;
+		while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 +1) * frag_size))){
+		  frag_pointed2++;
+		}
+		if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+		  fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
+		  if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+		    distance++;
+		  }else{
+		    fprintf(stderr, "False difference detected\n");
+		  }
+		}else{
+		  distance ++;
+		}
+		  
+		  
+	      }
+	    }else{
+	      distance++;
 	    }
+	  }else{
+	    distance++;
 	  }
+	    
 	}
+      }
 
-	fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
 
+      if(distance>0){
+	fprintf(stderr,"\nDifferent data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, mdp1->heapinfo[i].busy_block.size, mdp1->heapinfo[i].busy_block.busy_size);
+	fflush(NULL);
+	fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
 	mmalloc_backtrace_block_display(mdp1, i);
 	mmalloc_backtrace_block_display(mdp2, i);
-	errors++;
+	errors++; 
+	total_distance += distance;
       }
-
-      if( mdp1->heapinfo[i].busy_block.size == 0)
-	i = i + 1;
-      else
-	i = i + mdp1->heapinfo[i].busy_block.size;
-
+    
+      
+      i++;
+      
     }else{
       
       if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */
 
 	if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){
-	  fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, mdp1->heapinfo[i].type, mdp2->heapinfo[i].type);
+	  fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, mdp1->heapinfo[i].type, mdp2->heapinfo[i].type); fflush(NULL);
 	  errors++;
 	}
 
 	if(mdp1->heapinfo[i].busy_frag.nfree != mdp2->heapinfo[i].busy_frag.nfree){
-	  fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, mdp1->heapinfo[i].busy_frag.nfree, mdp2->heapinfo[i].busy_frag.nfree);
+	  fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, mdp1->heapinfo[i].busy_frag.nfree, mdp2->heapinfo[i].busy_frag.nfree); fflush(NULL);
 	  errors++;
 	} 
 	
 	if(mdp1->heapinfo[i].busy_frag.first != mdp2->heapinfo[i].busy_frag.first){
-	  fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size);
+	  fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", mdp1->heapinfo[i].busy_block.busy_size, mdp2->heapinfo[i].busy_block.busy_size); fflush(NULL);
 	  errors++;
 	} 
 
+	//fprintf(stderr,"\n");
+
 	frag_size = pow(2, mdp1->heapinfo[i].type);
 
 	for(j=0; j< (BLOCKSIZE/frag_size); j++){
 
 	  if(mdp1->heapinfo[i].busy_frag.frag_size[j] != mdp2->heapinfo[i].busy_frag.frag_size[j]){
-	    fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %hu - %hu\n", j, i, mdp1->heapinfo[i].busy_frag.frag_size[j], mdp2->heapinfo[i].busy_frag.frag_size[j]);
+	    fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %hu - %hu\n", j, i, mdp1->heapinfo[i].busy_frag.frag_size[j], mdp2->heapinfo[i].busy_frag.frag_size[j]); fflush(NULL);
 	    errors++;
 	  }
 
@@ -296,32 +378,84 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 	    addr_frag1 = (char *)addr_block1 + (j * frag_size);
 	    addr_frag2 = (char *)addr_block2 + (j * frag_size);
 
-	    //if(memcmp(addr_frag1, addr_frag2, frag_size) != 0){
-	    if(memcmp(addr_frag1, addr_frag2, mdp1->heapinfo[i].busy_frag.frag_size[j]) != 0){
-	      fprintf(stderr,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, mdp1->heapinfo[i].busy_frag.frag_size[j], i);
 
-	      /* Hamming distance on different blocks */
-	      distance = 0;
-	      //for(k=0;k<frag_size;k++){
-	      for(k=0;k<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
-		if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
-		  fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); 
+	    /* Hamming distance on different blocks */
+	    distance = 0;
+	    //for(k=0;k<frag_size;k++){
+	    for(k=0;k<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
+	      if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
+		//fprintf(stderr, "Different byte (offset=%d) (%p - %p) in fragment %zu in block %zu\n", k, (char *)addr_frag1 + k, (char *)addr_frag2 + k, j, i); fflush(NULL);
+		pointer_align = (k / sizeof(void*)) * sizeof(void*);
+		address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align));
+		address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align));				   
+		if(((address_pointed1 > (void *)s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < end_heap))){
+		  block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+		  block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) / BLOCKSIZE + 1;
+		  //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
+		  if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+		    if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+		      while(mdp1->heapinfo[block_pointed1].busy_block.size == 0)
+			block_pointed1--;
+		      while(mdp2->heapinfo[block_pointed2].busy_block.size == 0)
+			block_pointed2--;
+		      if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+			//addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+			//addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+			addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
+			addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+			fprintf(stderr, "Memcmp between blocks %d and %d (size = %zu)\n", block_pointed1, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_block.busy_size); 
+			if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+			  distance++;
+			}else{
+			  fprintf(stderr, "False difference detected\n");
+			}
+		      }else{
+			distance++;
+		      }
+		    }else{ // Fragmented block
+		      address_pointed1 = (char*)mdp1 + ((char*)address_pointed1 - (char*)s_heap);
+		      address_pointed2 = (char*)mdp2 + ((char*)address_pointed2 - (char*)s_heap);
+		      //addr_block_pointed1 = (void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)heapbase1);
+		      //addr_block_pointed2 = (void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)heapbase2);
+		      addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
+		      addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+		      frag_pointed1 = 0;
+		      while(address_pointed1 > (void*)((char*)addr_block_pointed1 + ((frag_pointed1 + 1) * frag_size))){
+			frag_pointed1++;
+		      }
+		      frag_pointed2 = 0;
+		      while(address_pointed2 > (void*)((char*)addr_block_pointed2 + ((frag_pointed2 + 1) * frag_size))){
+			frag_pointed2++;
+		      }
+		      if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+			fprintf(stderr, "Memcmp between fragments %d (block %d) and %d (block %d) (size = %d)\n", frag_pointed1, block_pointed1, frag_pointed2, block_pointed2,  mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]); 
+			if(memcmp((char*)addr_block_pointed1 + (frag_pointed1 * frag_size), (char*)addr_block_pointed2 + (frag_pointed2 * frag_size), mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+			  distance++;
+			}else{
+			  fprintf(stderr, "False difference detected\n");
+			}
+		      }else{
+			distance ++;
+		      }
+		    }
+		  }else{
+		    distance++;
+		  }
+		}else{
 		  distance++;
-		  pointer_align = (k / sizeof(void*)) * sizeof(void*);
-		  pointed_address1 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_frag1 + pointer_align)), s_heap, r_heap));
-		  pointed_address2 = xbt_strdup(get_addr_memory_map(*((void **)((char *)addr_frag2 + pointer_align)), s_heap, r_heap));
-		  fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_frag1 + pointer_align)), pointed_address1, *((void **)((char *)addr_frag2 + pointer_align)), pointed_address2);
-		  if((strcmp(pointed_address1, pointed_address2) == 0) && (strcmp(pointed_address1, "std_heap") == 0)){
-		    /* FIXME : compare value pointed thanks to DWARF */
-		  } 
 		}
 	      }
 
+	    }
+	    
+	    if(distance > 0){
+	      fprintf(stderr,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, mdp1->heapinfo[i].busy_frag.frag_size[j], i);
 	      fprintf(stderr, "Hamming distance between fragments : %d\n", distance);
-
 	      mmalloc_backtrace_fragment_display(mdp1, i, j);
 	      mmalloc_backtrace_fragment_display(mdp2, i, j);
 	      errors++;
+	      total_distance += distance;
+	      
 	    }
 
 	  }
@@ -333,20 +467,24 @@ int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap,
 
 	i++;
 
+	//fprintf(stderr,"\n");
+
       }
       
     }
 
   }
 
-  free(pointed_address1);
-  free(pointed_address2);
+  //free(pointed_address1);
+  //free(pointed_address2);
+
+  fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
 
   return (errors);
 }
 
 
-const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
+void *get_end_addr_heap(void *heap){
 
   FILE *fp;                     /* File pointer to process's proc maps file */
   char *line = NULL;            /* Temporal storage for each line that is readed */
@@ -358,11 +496,6 @@ const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
   if(fp == NULL)
     perror("fopen failed");
 
-  if(addr == NULL){
-    free(line);
-    fclose(fp);
-    return "nil";
-  }
 
   xbt_dynar_t lfields = NULL;
   xbt_dynar_t start_end  = NULL;
@@ -379,32 +512,14 @@ const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
     start_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 0, char*), NULL, 16);
     end_addr = (void *) strtoul(xbt_dynar_get_as(start_end, 1, char*), NULL, 16);
 
-    if((addr > start_addr) && ( addr < end_addr)){
+    if(start_addr == heap){
       free(line);
       fclose(fp);
-      if(start_addr == s_heap){
-	xbt_dynar_reset(lfields);
-	xbt_free(lfields);
-	xbt_dynar_reset(start_end);
-	xbt_free(start_end);
-	return "std_heap";
-      }
-      if(start_addr == r_heap){
-	xbt_dynar_reset(lfields);
-	xbt_free(lfields);
-	xbt_dynar_reset(start_end);
-	xbt_free(start_end);
-	return "raw_heap";
-      }
-      if(xbt_dynar_length(lfields) == 6){
-	return xbt_dynar_get_as(lfields, xbt_dynar_length(lfields) - 1, char*);
-      }else{
-	xbt_dynar_reset(lfields);
-	xbt_free(lfields);
-	xbt_dynar_reset(start_end);
-	xbt_free(start_end);
-	return "Anonymous";
-      }
+      xbt_dynar_reset(lfields);
+      xbt_free(lfields);
+      xbt_dynar_reset(start_end);
+      xbt_free(start_end);
+      return end_addr;
     }
 
   }
@@ -415,10 +530,12 @@ const char* get_addr_memory_map(void *addr, void* s_heap, void* r_heap){
   xbt_free(start_end);
   free(line);
   fclose(fp);
-  return "Unknown area";
+  return NULL;
+
 
 }
 
+
 void mmalloc_display_info_heap(xbt_mheap_t h){
 
 }