}
}
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void* s_heap, void* r_heap){
if(mdp1 == NULL && mdp2 == NULL){
- XBT_DEBUG("Malloc descriptors null\n");
+ fprintf(stderr, "Malloc descriptors null\n");
return 0;
}
- int errors = mmalloc_compare_mdesc(mdp1, mdp2);
+ int errors = mmalloc_compare_mdesc(mdp1, mdp2, s_heap, r_heap);
return (errors > 0);
}
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void* s_heap, void* r_heap){
int errors = 0;
- if(mdp1->headersize != mdp2->headersize){
+ /*if(mdp1->headersize != mdp2->headersize){
fprintf(stderr, "Different size of the file header for the mapped files\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->version != mdp2->version){
fprintf(stderr,"Different version of the mmalloc package\n");
return 1;
- }
+ }*/
size_t i, j;
int k;
int distance = 0;
+ int pointer_align;
/* Check busy blocks*/
}
if(memcmp(addr_block1, addr_block2, (mdp1->heapinfo[i].busy_block.busy_size)) != 0){
- fprintf(stderr,"Different 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);
+ 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.busy_size;k++){
- if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 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);
distance++;
+ pointer_align = (k / sizeof(void*)) * sizeof(void*);
+ fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_block1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_block1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_block2 + pointer_align)),get_addr_memory_map(*((void **)((char *)addr_block2 + pointer_align)), s_heap, r_heap) );
+ }
}
fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
addr_frag1 = (char *)addr_block1 + (j * frag_size);
addr_frag2 = (char *)addr_block2 + (j * frag_size);
+
if(memcmp(addr_frag1, addr_frag2, mdp1->heapinfo[i].busy_frag.frag_size[j]) != 0){
- fprintf(stderr,"Different 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,"\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<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
- if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 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);
distance++;
+ pointer_align = (k / sizeof(void*)) * sizeof(void*);
+ fprintf(stderr, "Pointed address : %p (in %s) - %p (in %s)\n", *((void **)((char *)addr_frag1 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag1 + pointer_align)), s_heap, r_heap), *((void **)((char *)addr_frag2 + pointer_align)), get_addr_memory_map(*((void **)((char *)addr_frag2 + pointer_align)), s_heap, r_heap));
+ }
}
fprintf(stderr, "Hamming distance between fragments : %d\n", distance);
}
+const char* get_addr_memory_map(void *addr, void* s_heap, void* r_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 */
+
+ fp = fopen("/proc/self/maps", "r");
+
+ if(fp == NULL)
+ perror("fopen failed");
+
+ if(addr == NULL)
+ return "nil";
+
+ char *lfields[6], *start, *end, *endptr;
+ int i;
+ void *start_addr;
+ void *end_addr;
+
+ while ((read = getline(&line, &n, fp)) != -1) {
+
+ line[read - 1] = '\0';
+
+ lfields[0] = strtok(line, " ");
+
+ for (i = 1; i < 6; i++) {
+ lfields[i] = strtok(NULL, " ");
+ }
+
+ start = strtok(lfields[0], "-");
+ start_addr = (void *) strtoul(start, &endptr, 16);
+
+ if(start_addr == s_heap)
+ lfields[5] = strdup("std_heap");
+ if(start_addr == r_heap)
+ lfields[5] = strdup("raw_heap");
+ end = strtok(NULL, "-");
+ end_addr = (void *) strtoul(end, &endptr, 16);
+
+ if((addr > start_addr) && ( addr < end_addr)){
+ free(line);
+ fclose(fp);
+ if(lfields[5] != NULL){
+ return lfields[5];
+ }else{
+ return "Anonymous";
+ }
+ }
+
+ }
+
+ return "Unknown area";
+
+}
+
void mmalloc_display_info_heap(xbt_mheap_t h){
}
