}
}
-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;
//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;
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){
//addr_block1 = (void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1);
//addr_block2 = (void*) (((ADDR2UINT(1)) - 1) * BLOCKSIZE + (char*)heapbase2);
- addr_block1 = heapbase1 + ((i-1)*BLOCKSIZE);
- addr_block2 = heapbase2 + ((i-1)*BLOCKSIZE);
+ addr_block1 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
+ addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
if(mdp1->heapinfo[i].type == 0){ /* busy large block */
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 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
+ 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].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 = heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+ 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){
}else{
fprintf(stderr, "False difference detected\n");
}
-<<<<<<< HEAD
}else{
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 = heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+ 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++;
mmalloc_backtrace_block_display(mdp1, i);
mmalloc_backtrace_block_display(mdp2, i);
errors++;
+ total_distance += distance;
}
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 > s_heap) && (address_pointed1 < end_heap)) && ((address_pointed2 > s_heap) && (address_pointed2 < end_heap))){
+ 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].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 = heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+ 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");
}
-<<<<<<< HEAD
}else{
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 = heapbase1 + ((block_pointed1 - 1)*BLOCKSIZE);
- addr_block_pointed2 = heapbase2 + ((block_pointed2 - 1)*BLOCKSIZE);
+ 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++;
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);
}
-void *get_end_addr_heap(void *s_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 */
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 == s_heap){
+ if(start_addr == heap){
free(line);
fclose(fp);
xbt_dynar_reset(lfields);