}
}
-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, void* s_heap){
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, s_heap);
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, void* s_heap){
int errors = 0;
return 1;
}*/
- void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
- void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_heap);
+ //void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
+ //void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_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, frag_size_pointed;
+ size_t frag_size = 0; /* FIXME: arbitrary initialization */
+ /* size_t frag_size_pointed; FIXME: unused */
i = 1;
int k;
int distance = 0;
+ int total_distance = 0;
void *end_heap = get_end_addr_heap(s_heap);
int frag_pointed1, frag_pointed2;
+
/* Check busy blocks*/
while(i < mdp1->heaplimit){
//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 = (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){
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 = (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++;
distance++;
}
}else{ // Fragmented block
- frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
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 = (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++;
}
}
+ }
- 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++;
- }
+
+ 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++;
+ total_distance += distance;
}
+
i++;
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 = (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++;
distance++;
}
}else{ // Fragmented block
- frag_size_pointed = pow(2, mdp1->heapinfo[block_pointed1].type);
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 = (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++;
}
}
- 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++;
-
- }
-
-
+ }
+
+ 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;
+
}
}
//free(pointed_address1);
//free(pointed_address2);
+ fprintf(stderr, "Hamming distance between heap regions : %d\n", total_distance);
+
return (errors);
}