extern char *xbt_binary_name;
-void mmalloc_backtrace_display(xbt_mheap_t mdp, void *ptr){
- size_t block = BLOCK(ptr);
- int type;
- xbt_ex_t e;
-
- if ((char *) ptr < (char *) mdp->heapbase || block > mdp->heapsize) {
- fprintf(stderr,"Ouch, this pointer is not mine. I cannot display its backtrace. I refuse it to death!!\n");
- abort();
- }
-
- 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 %p was malloced (%d frames):\n",ptr,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_block_display(xbt_mheap_t mdp, size_t block){
+void mmalloc_backtrace_block_display(void* heapinfo, 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) {
+ if (((malloc_info *)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;
+ memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE);
+e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size;
xbt_ex_setup_backtrace(&e);
if (e.used == 0) {
}
}
-void mmalloc_backtrace_fragment_display(xbt_mheap_t mdp, size_t block, size_t frag){
+void mmalloc_backtrace_fragment_display(void* heapinfo, 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);
+ memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE);
e.used = XBT_BACKTRACE_SIZE;
xbt_ex_setup_backtrace(&e);
void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
+ fprintf(stderr, "s_heap->heapbase : %p\n", ((struct mdesc*)s_heap)->heapbase);
+
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);
+ fprintf(stderr, "Heapbase1 : %p, Heapbase2 : %p\n", heapbase1, heapbase2);
+ fprintf(stderr, "Heapinfo : %p\n", mdp1->heapinfo);
+
+ malloc_info* heapinfo1 = (malloc_info *)((char *)mdp1 + ((char *)mdp1->heapinfo - (char *)s_heap));
+ malloc_info* heapinfo2 = (malloc_info *)((char *)mdp2 + ((char *)mdp2->heapinfo - (char *)s_heap));
+
+ fprintf(stderr, "Heapinfo1 : %p, Heapinfo2 : %p\n", heapinfo1, heapinfo2);
size_t i, j;
- void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
+ void *addr_block1 = NULL, *addr_block2 = NULL, *addr_frag1 = NULL, *addr_frag2 = NULL;
size_t frag_size;
i = 1;
- int k;
+ int k = 0;
int distance = 0;
int total_distance = 0;
int pointer_align;
- void *address_pointed1, *address_pointed2;
+ void *address_pointed1 = NULL, *address_pointed2 = NULL;
int block_pointed1, block_pointed2, frag_pointed1, frag_pointed2;
- void *addr_block_pointed1, *addr_block_pointed2;
+ void *addr_block_pointed1 = NULL, *addr_block_pointed2 = NULL, *addr_frag_pointed1 = NULL, *addr_frag_pointed2 = NULL;
/* Check busy blocks*/
while(i < mdp1->heaplimit){
- 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);
+ if(heapinfo1[i].type != heapinfo2[i].type){
+ fprintf(stderr,"Different type of block : %d - %d\n", heapinfo1[i].type, heapinfo2[i].type);
errors++;
}
/* Get address of block i in each heap */
addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
- xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
-
addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
- xbt_assert(addr_block2 < breakval2, "Block address out of heap memory used");
- if(mdp1->heapinfo[i].type == 0){ /* busy large block */
+ if(heapinfo1[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);
+ if(heapinfo1[i].busy_block.size != heapinfo2[i].busy_block.size){
+ fprintf(stderr,"Different size of a large cluster : %zu - %zu\n", heapinfo1[i].busy_block.size, heapinfo2[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);
+ if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){
+ fprintf(stderr,"Different busy_size of a large cluster : %zu - %zu\n", heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size);
fflush(NULL);
errors++;
}
distance = 0;
- for(k=0;k<mdp1->heapinfo[i].busy_block.busy_size;k++){
+ for(k=0;k<heapinfo1[i].busy_block.busy_size;k++){
if(memcmp(((char *)addr_block1) + k, ((char *)addr_block2) + k, 1) != 0){
address_pointed1 = *((void **)((char *)addr_block1 + pointer_align));
address_pointed2 = *((void **)((char *)addr_block2 + pointer_align));
- fprintf(stderr, "Addresses pointed : %p - %p\n", address_pointed1, address_pointed2);
+ fprintf(stderr, "Addresses pointed : %p - %p \n", address_pointed1, address_pointed2);
+ /* Get block number */
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((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) {
- fprintf(stderr, "Unknown pointer ! \n");
+ fprintf(stderr, "Unknown pointer(s) ! \n");
fflush(NULL);
distance++;
continue;
}
-
+
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));
-
- if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+
+ fprintf(stderr, "Addr blocks pointed : %p - %p\n", addr_block_pointed1, addr_block_pointed2);
+
+ if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){
- if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+ if(heapinfo1[block_pointed1].type == 0){ // Large block
- if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+ if(heapinfo1[block_pointed1].busy_block.busy_size == heapinfo2[block_pointed2].busy_block.busy_size){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+ if(memcmp(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size) != 0){
distance++;
}else{
fprintf(stderr, "False difference detected\n");
}
}else{ // Fragmented block
-
- frag_pointed1 = ((char *)address_pointed1 - (char *)((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)((struct mdesc*)s_heap)->heapbase))) / pow( 2, mdp1->heapinfo[block_pointed1].type);
- frag_pointed2 = ((char *)address_pointed2 - (char *)((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)((struct mdesc*)s_heap)->heapbase))) / pow( 2, mdp1->heapinfo[block_pointed1].type);
+
+ /* Get fragment number */
+ frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type;
+ frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type;
fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
- if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type)))){
- fprintf(stderr, "Unknown pointer ! \n");
- fflush(NULL);
- distance++;
- continue;
- }
+ addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type));
+ addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type));
- fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]);
+ fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2);
- if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+ fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]);
+
+ if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+ if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
distance++;
}else{
fprintf(stderr, "False difference detected\n");
}
}else{
- fprintf(stderr, "Pointers on blocks with different types \n");
- distance++;
+
+ if(((heapinfo1[block_pointed1].type == 0) && (heapinfo2[block_pointed2].type != 0)) || ((heapinfo1[block_pointed1].type != 0) && (heapinfo2[block_pointed2].type == 0))){
+ fprintf(stderr, "Pointers on blocks with different types \n");
+ distance++;
+ }else{
+
+ frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type;
+ frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type;
+
+ fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+
+ addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type));
+ addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type));
+
+ fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2);
+
+ fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]);
+
+ if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+
+ if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+ distance++;
+ }else{
+ fprintf(stderr, "False difference detected\n");
+ }
+
+ }else{
+ 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);
+ fprintf(stderr,"\nDifferent data in large block %zu (size = %zu (in blocks), busy_size = %zu (in bytes))\n", i, heapinfo1[i].busy_block.size, heapinfo1[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);
+ mmalloc_backtrace_block_display(heapinfo1, i);
+ mmalloc_backtrace_block_display(heapinfo2, i);
fprintf(stderr, "\n");
errors++;
total_distance += distance;
}else{
- if(mdp1->heapinfo[i].type > 0){ /* busy fragmented block */
+ if(heapinfo1[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); fflush(NULL);
+ if(heapinfo1[i].type != heapinfo2[i].type){
+ fprintf(stderr,"Different size of fragments in fragmented block %zu : %d - %d\n", i, heapinfo1[i].type, heapinfo2[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);
+ if(heapinfo1[i].busy_frag.nfree != heapinfo2[i].busy_frag.nfree){
+ fprintf(stderr,"Different free fragments in fragmented block %zu : %zu - %zu\n", i, heapinfo1[i].busy_frag.nfree, heapinfo2[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);
+ if(heapinfo1[i].busy_frag.first != heapinfo2[i].busy_frag.first){
+ fprintf(stderr,"Different first free fragment in fragmented block %zu : %zu - %zu\n", i, heapinfo1[i].busy_frag.first, heapinfo2[i].busy_frag.first); fflush(NULL);
errors++;
}
- frag_size = pow(2, mdp1->heapinfo[i].type);
+ frag_size = pow(2, heapinfo1[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);
+ if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){
+ fprintf(stderr,"Different busy_size for fragment %zu in block %zu : %hu - %hu\n", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); fflush(NULL);
errors++;
}
- if(mdp1->heapinfo[i].busy_frag.frag_size[j] > 0){
+ if(heapinfo1[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<mdp1->heapinfo[i].busy_frag.frag_size[j];k++){
+ for(k=0;k<heapinfo1[i].busy_frag.frag_size[j];k++){
if(memcmp(((char *)addr_frag1) + k, ((char *)addr_frag2) + k, 1) != 0){
pointer_align = (k / sizeof(void*)) * sizeof(void*);
address_pointed1 = *((void **)((char *)addr_frag1 + pointer_align));
address_pointed2 = *((void **)((char *)addr_frag2 + pointer_align));
+
+ fprintf(stderr, "Addresses pointed : %p - %p \n", address_pointed1, address_pointed2);
- fprintf(stderr, "Addresses pointed : %p - %p\n", address_pointed1, address_pointed2);
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((char *) address_pointed1 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed1 > mdp1->heapsize || block_pointed1 < 1 || (char *) address_pointed2 < (char*)((struct mdesc*)s_heap)->heapbase || block_pointed2 > mdp2->heapsize || block_pointed2 < 1) {
- fprintf(stderr, "Unknown pointer ! \n");
+ fprintf(stderr, "Unknown pointer(s) ! \n");
fflush(NULL);
distance++;
continue;
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));
+
+ fprintf(stderr, "Addr block pointed : %p - %p\n", addr_block_pointed1, addr_block_pointed2);
- if(mdp1->heapinfo[block_pointed1].type == mdp2->heapinfo[block_pointed2].type){
+ if(heapinfo1[block_pointed1].type == heapinfo2[block_pointed2].type){
- if(mdp1->heapinfo[block_pointed1].type == 0){ // Large block
+ if(heapinfo1[block_pointed1].type == 0){ // Large block
- if(mdp1->heapinfo[block_pointed1].busy_block.busy_size == mdp2->heapinfo[block_pointed2].busy_block.busy_size){
+ if(heapinfo1[block_pointed1].busy_block.busy_size == heapinfo2[block_pointed2].busy_block.busy_size){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_block.busy_size) != 0){
+ if(memcmp(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size) != 0){
distance++;
}else{
fprintf(stderr, "False difference detected\n");
}
}else{ // Fragmented block
+
+ frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type;
+ frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type;
+
+ fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
- frag_pointed1 = ((char *)address_pointed1 - (char *)((void*) (((ADDR2UINT((size_t)block_pointed1)) - 1) * BLOCKSIZE + (char*)((struct mdesc*)s_heap)->heapbase))) / pow( 2, mdp1->heapinfo[block_pointed1].type);
- frag_pointed2 = ((char *)address_pointed2 - (char *)((void*) (((ADDR2UINT((size_t)block_pointed2)) - 1) * BLOCKSIZE + (char*)((struct mdesc*)s_heap)->heapbase))) / pow( 2, mdp1->heapinfo[block_pointed1].type);
+ addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type));
+ addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type));
- fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+ fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2);
- if((frag_pointed1 < 0) || (frag_pointed1 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type))) || (frag_pointed2 < 0) || (frag_pointed2 > (BLOCKSIZE / pow( 2, mdp1->heapinfo[block_pointed1].type)))){
- fprintf(stderr, "Unknown pointer ! \n");
- fflush(NULL);
- distance++;
- continue;
- }
-
- fprintf(stderr, "Size used in fragments pointed : %d - %d\n", mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1], mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]);
+ fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]);
- if(mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1] == mdp2->heapinfo[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+ if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){
- if(memcmp(addr_block_pointed1, addr_block_pointed2, mdp1->heapinfo[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+ if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
distance++;
}else{
fprintf(stderr, "False difference detected\n");
}
}else{
- fprintf(stderr, "Pointers on blocks with different types \n");
- distance++;
+
+ if(((heapinfo1[block_pointed1].type == 0) && (heapinfo2[block_pointed2].type != 0)) || ((heapinfo1[block_pointed1].type != 0) && (heapinfo2[block_pointed2].type == 0))){
+ fprintf(stderr, "Pointers on blocks with different types \n");
+ distance++;
+ }else{
+
+ frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed1].type;
+ frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> ((struct mdesc*)s_heap)->heapinfo[block_pointed2].type;
+
+ fprintf(stderr, "Fragments pointed : %d - %d\n", frag_pointed1, frag_pointed2);
+
+ addr_frag_pointed1 = (char*)addr_block_pointed1 + (frag_pointed1 * (int)pow(2, heapinfo1[block_pointed1].type));
+ addr_frag_pointed2 = (char*)addr_block_pointed2 + (frag_pointed2 * (int)pow(2, heapinfo2[block_pointed2].type));
+
+ fprintf(stderr, "Addr frag pointed : %p - %p\n", addr_frag_pointed1, addr_frag_pointed2);
+
+ fprintf(stderr, "Size used in fragments pointed : %d - %d\n", heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]);
+
+ if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] == heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]){
+
+ if(memcmp(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1]) != 0){
+ distance++;
+ }else{
+ fprintf(stderr, "False difference detected\n");
+ }
+
+ }else{
+ 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,"\nDifferent data in fragment %zu (size = %zu, size used = %hu) in block %zu \n", j, frag_size, heapinfo1[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);
+ mmalloc_backtrace_fragment_display(heapinfo1, i, j);
+ mmalloc_backtrace_fragment_display(heapinfo2, i, j);
fprintf(stderr, "\n");
errors++;
total_distance += distance;
/* } */
-void mmalloc_display_info_heap(xbt_mheap_t h){
-
-}
-
-