#include "xbt/ex_interface.h" /* internals of backtrace setup */
#include "xbt/str.h"
+#include "mc/mc.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
"Logging specific to mm_diff in mmalloc");
}
void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
-
+
xbt_ex_t e;
memcpy(&e.bt,&(mdp->heapinfo[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
}
}
-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;
- /*if(mdp1->headersize != mdp2->headersize){
- fprintf(stderr, "Different size of the file header for the mapped files\n");
- return 1;
- }
-
- if(mdp1->refcount != mdp2->refcount){
- fprintf(stderr, "Different number of processes that attached the heap\n");
- return 1;
- }
-
- if(strcmp(mdp1->magic, mdp2->magic) != 0){
- fprintf(stderr,"Different magic number\n");
- return 1;
- }
-
- if(mdp1->flags != mdp2->flags){
- fprintf(stderr,"Different flags\n");
- return 1;
- }
-
- if(mdp1->heapsize != mdp2->heapsize){
- fprintf(stderr,"Different number of info entries\n");
- return 1;
- }
-
- if(mdp1->heapbase != mdp2->heapbase){
- fprintf(stderr,"Different first block of the heap\n");
- return 1;
- }
-
- if(mdp1->heapindex != mdp2->heapindex){
- fprintf(stderr,"Different index for the heap table : %zu - %zu\n", mdp1->heapindex, mdp2->heapindex);
- return 1;
- }
-
- if(mdp1->base != mdp2->base){
- fprintf(stderr,"Different base address of the memory region\n");
- return 1;
- }
-
- if(mdp1->breakval != mdp2->breakval){
- fprintf(stderr,"Different current location in the memory region\n");
- return 1;
- }
-
- if(mdp1->top != mdp2->top){
- fprintf(stderr,"Different end of the current location in the memory region\n");
- return 1;
- }
-
if(mdp1->heaplimit != mdp2->heaplimit){
fprintf(stderr,"Different limit of valid info table indices\n");
return 1;
}
- if(mdp1->fd != mdp2->fd){
- fprintf(stderr,"Different file descriptor for the file to which this malloc heap is mapped\n");
- return 1;
- }
+ void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
- if(mdp1->version != mdp2->version){
- fprintf(stderr,"Different version of the mmalloc package\n");
- return 1;
- }*/
+ void *heapbase1 = (char *)mdp1 + BLOCKSIZE;
+ void *heapbase2 = (char *)mdp2 + BLOCKSIZE;
+
+ void * breakval1 = (char *)mdp1 + ((char *)mdp1->breakval - (char *)s_heap);
+ void * breakval2 = (char *)mdp2 + ((char *)mdp2->breakval - (char *)s_heap);
size_t i, j;
void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
size_t frag_size;
- i = 0;
+ i = 1;
int k;
int distance = 0;
+ int total_distance = 0;
+
int pointer_align;
+ void *address_pointed1, *address_pointed2;
- char *pointed_address1 = NULL, *pointed_address2 = NULL;
+ int block_pointed1, block_pointed2;
+ void *addr_block_pointed1, *addr_block_pointed2;
/* Check busy blocks*/
errors++;
}
- addr_block1 = (char *)mdp1 + mdp1->headersize + ((i-1) * BLOCKSIZE);
- addr_block2 = (char *)mdp2 + mdp2->headersize + ((i-1) * BLOCKSIZE);
+ addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
+ xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
+
+ addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
+ xbt_assert(addr_block2 < breakval2, "Block address out of heap memory used");
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);
- errors++;
- }
+ 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);
- 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 */
- }
- }
- }
-
- fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
-
- mmalloc_backtrace_block_display(mdp1, i);
- mmalloc_backtrace_block_display(mdp2, i);
- errors++;
+ 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( mdp1->heapinfo[i].busy_block.size == 0)
- i = i + 1;
- else
- i = i + mdp1->heapinfo[i].busy_block.size;
+ /* 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((((char *)addr_block1) + k != 0) && (((char *)addr_block2) + k != 0)){
+ 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 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
+ block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
+ block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
+ //fprintf(stderr, "Blocks pointed : %d - %d\n", block_pointed1, block_pointed2);
+ if((block_pointed1 == 0) && (block_pointed2 == 0)){
+ 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;
+ if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+ if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+ if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+ addr_block_pointed1 = (char*)heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
+ addr_block_pointed2 = (char*)heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+ 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
+ addr_block_pointed1 = (char*)mdp1 + ((char *)address_pointed1 - (char *)s_heap);
+ addr_block_pointed2 = (char*)mdp2 + ((char *)address_pointed2 - (char *)s_heap);
+ if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[0]){
+ if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0]) != 0){
+ fprintf(stderr, "Pointed fragments are different \n");
+ distance++;
+ }else{
+ fprintf(stderr, "False difference detected\n");
+ }
+ }else{
+ fprintf(stderr, "Different size of pointed fragments\n");
+ distance ++;
+ }
+ }
+ }else{
+ fprintf(stderr, "Pointers on blocks with different types \n");
+ distance++;
+ }
+ }else{
+ /* FIXME : peut pointer vers le début d'un fragment mais dans un bloc */
+ fprintf(stderr, "Pointed addresses (%p - %p) not valid\n", address_pointed1, address_pointed2);
+ distance++;
+ }
+ }else{
+ fprintf(stderr, "Pointed addresses (%p - %p) not in std_heap\n", address_pointed1, address_pointed2);
+ 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);
+ fprintf(stderr, "\n");
+ errors++;
+ total_distance += distance;
+ }
+
+ 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);
- 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);
- 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);
- errors++;
- }
-
- 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]);
- errors++;
- }
-
- if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){
-
- 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);
- 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 */
- }
- }
- }
-
- fprintf(stderr, "Hamming distance between fragments : %d\n", distance);
-
- mmalloc_backtrace_fragment_display(mdp1, i, j);
- mmalloc_backtrace_fragment_display(mdp2, i, j);
- errors++;
- }
-
- }
- }
-
- i++;
+ 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); 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); 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); fflush(NULL);
+ errors++;
+ }
+
+ 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]); fflush(NULL);
+ errors++;
+ }
+
+ if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){
+
+ addr_frag1 = (char *)addr_block1 + (j * frag_size);
+ xbt_assert(addr_frag1 < breakval1, "Fragment address out of heap memory used");
+
+ addr_frag2 = (char *)addr_block2 + (j * frag_size);
+ xbt_assert(addr_frag1 < breakval1, "Fragment address out of heap memory used");
+
+ /* 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((((char *)addr_frag1) + k != 0) && (((char *)addr_frag2) + k != 0)){
+ 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 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
+ block_pointed1 = ((char*)address_pointed1 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
+ block_pointed2 = ((char*)address_pointed2 - (char*)((struct mdesc*)s_heap)->heapbase) % BLOCKSIZE;
+ if((block_pointed1 == 0) && (block_pointed2 == 0)){
+ 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;
+ if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+ if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+ if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+ 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
+ addr_block_pointed1 = (char*)mdp1 + ((char *)address_pointed1 - (char *)s_heap);
+ addr_block_pointed2 = (char*)mdp2 + ((char *)address_pointed2 - (char *)s_heap);
+ if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[0]){
+ if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[0]) != 0){
+ distance++;
+ }else{
+ fprintf(stderr, "False difference detected\n");
+ }
+ }else{
+ distance ++;
+ }
+ }
+ }else{
+ fprintf(stderr, "Pointers on blocks with different types \n");
+ distance++;
+ }
+ }else{
+ /* FIXME : peut pointer vers le début d'un fragment mais dans un bloc */
+ fprintf(stderr, "Pointed addresses (%p - %p) not valid \n", address_pointed1, address_pointed2);
+ distance++;
+ }
+ }else{
+ fprintf(stderr, "Pointed addresses (%p - %p) not in std_heap\n", address_pointed1, address_pointed2);
+ distance++;
+ }
+ }
+ //}
+
+ }
+
+ 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);
+ fprintf(stderr, "\n");
+ errors++;
+ total_distance += distance;
+
+ }
+
+ }
+ }
+
+ i++;
}else{ /* free block */
- i++;
+ i++;
}
-
+
}
}
- 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 */
- ssize_t read; /* Number of bytes readed */
- size_t n = 0; /* Amount of bytes to read by getline */
+/* FILE *fp; /\* File pointer to process's proc maps file *\/ */
+/* char *line = NULL; /\* Temporal storage for each line that is readed *\/ */
+/* ssize_t read; /\* Number of bytes readed *\/ */
+/* size_t n = 0; /\* Amount of bytes to read by getline *\/ */
- fp = fopen("/proc/self/maps", "r");
-
- if(fp == NULL)
- perror("fopen failed");
+/* fp = fopen("/proc/self/maps", "r"); */
- if(addr == NULL){
- free(line);
- fclose(fp);
- return "nil";
- }
+/* if(fp == NULL) */
+/* perror("fopen failed"); */
- xbt_dynar_t lfields = NULL;
- xbt_dynar_t start_end = NULL;
- void *start_addr;
- void *end_addr;
-
- while ((read = getline(&line, &n, fp)) != -1) {
-
- xbt_str_trim(line, NULL);
- xbt_str_strip_spaces(line);
- lfields = xbt_str_split(line,NULL);
-
- start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-");
- 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)){
- 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_t lfields = NULL; */
+/* xbt_dynar_t start_end = NULL; */
+/* void *start_addr; */
+/* void *end_addr; */
- xbt_dynar_reset(lfields);
- xbt_free(lfields);
- xbt_dynar_reset(start_end);
- xbt_free(start_end);
- free(line);
- fclose(fp);
- return "Unknown area";
+/* while ((read = getline(&line, &n, fp)) != -1) { */
+
+/* xbt_str_trim(line, NULL); */
+/* xbt_str_strip_spaces(line); */
+/* lfields = xbt_str_split(line,NULL); */
+
+/* start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-"); */
+/* 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(start_addr == heap){ */
+/* free(line); */
+/* fclose(fp); */
+/* xbt_dynar_reset(lfields); */
+/* xbt_free(lfields); */
+/* xbt_dynar_reset(start_end); */
+/* xbt_free(start_end); */
+/* return end_addr; */
+/* } */
+
+/* } */
+
+/* xbt_dynar_reset(lfields); */
+/* xbt_free(lfields); */
+/* xbt_dynar_reset(start_end); */
+/* xbt_free(start_end); */
+/* free(line); */
+/* fclose(fp); */
+/* return NULL; */
+
+
+/* } */
-}
void mmalloc_display_info_heap(xbt_mheap_t h){
