}
}
-int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2, void *std_heap_addr){
+
+void mmalloc_backtrace_block_display(xbt_mheap_t mdp, size_t block){
+
+ int type;
+ xbt_ex_t e;
+
+ type = mdp->heapinfo[block].type;
+
+ if (type != 0) {
+ fprintf(stderr,"Only full blocks are backtraced for now. Ignoring your request.\n");
+ return;
+ }
+ if (mdp->heapinfo[block].busy_block.bt_size == 0) {
+ fprintf(stderr,"No backtrace available for that block, sorry.\n");
+ return;
+ }
+
+ memcpy(&e.bt,&(mdp->heapinfo[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
+ e.used = mdp->heapinfo[block].busy_block.bt_size;
+
+ xbt_ex_setup_backtrace(&e);
+ if (e.used == 0) {
+ fprintf(stderr, "(backtrace not set)\n");
+ } else if (e.bt_strings == NULL) {
+ fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+ } else {
+ int i;
+
+ fprintf(stderr, "Backtrace of where the block %zu where malloced (%d frames):\n", block ,e.used);
+ for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
+ fprintf(stderr,"%d",i);fflush(NULL);
+ fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+ }
+ }
+}
+
+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);
+ e.used = XBT_BACKTRACE_SIZE;
+
+ xbt_ex_setup_backtrace(&e);
+ if (e.used == 0) {
+ fprintf(stderr, "(backtrace not set)\n");
+ } else if (e.bt_strings == NULL) {
+ fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+ } else {
+ int i;
+
+ fprintf(stderr, "Backtrace of where the fragment %zu in block %zu where malloced (%d frames):\n", frag, block ,e.used);
+ for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
+ fprintf(stderr,"%d",i);fflush(NULL);
+ fprintf(stderr, "---> %s\n", e.bt_strings[i] + 4);
+ }
+ }
+}
+
+int mmalloc_compare_heap(xbt_mheap_t mdp1, xbt_mheap_t mdp2){
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, std_heap_addr);
+ int errors = mmalloc_compare_mdesc(mdp1, mdp2);
return (errors > 0);
}
-int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2, void *std_heap_addr){
+int mmalloc_compare_mdesc(struct mdesc *mdp1, struct mdesc *mdp2){
+
+ 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;
i = 0;
+ int k;
+ int distance = 0;
+ int pointer_align;
+
/* Check busy blocks*/
while(i < mdp1->heapindex){
if(mdp1->heapinfo[i].type != mdp2->heapinfo[i].type){
fprintf(stderr,"Different type of block : %d - %d\n", mdp1->heapinfo[i].type, mdp2->heapinfo[i].type);
- return 1;
+ errors++;
}
addr_block1 = (char *)mdp1 + sizeof(struct mdesc) + (i * BLOCKSIZE);
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);
- return 1;
+ 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);
- return 1;
+ errors++;
}
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);
- return 1;
+ 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){
+ 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, "Pointer address : %p - %p\n", *((void **)((char *)addr_block1 + pointer_align)), *((void **)((char *)addr_block2 + pointer_align)));
+ }
+ }
+
+ fprintf(stderr, "Hamming distance between blocks : %d\n", distance);
+
+ mmalloc_backtrace_block_display(mdp1, i);
+ mmalloc_backtrace_block_display(mdp2, i);
+ errors++;
}
+
i = i + mdp1->heapinfo[i].busy_block.size;
}else{
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);
- return 1;
+ 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);
- return 1;
+ 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);
- return 1;
+ errors++;
}
- for(j=0; j< MAX_FRAGMENT_PER_BLOCK; j++){
+ 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 : %u - %u\n", j, i, mdp1->heapinfo[i].busy_frag.frag_size[j], mdp2->heapinfo[i].busy_frag.frag_size[j]);
- return 1;
+ 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){
- frag_size = pow(2, mdp1->heapinfo[i].type);
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){
- fprintf(stderr,"Different data in fragment %zu in block %zu \n", j, i);
- return 1;
+
+ 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<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*);
+ fprintf(stderr, "Pointer address : %p - %p\n", *((void **)((char *)addr_frag1 + pointer_align)), *((void **)((char *)addr_frag2 + pointer_align)));
+ }
+ }
+
+ fprintf(stderr, "Hamming distance between fragments : %d\n", distance);
+
+ mmalloc_backtrace_fragment_display(mdp1, i, j);
+ mmalloc_backtrace_fragment_display(mdp2, i, j);
+ errors++;
}
}
}
- return 0;
+ return (errors);
}