#include "xbt/ex_interface.h" /* internals of backtrace setup */
#include "xbt/str.h"
+#include "mc/mc.h"
XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
"Logging specific to mm_diff in mmalloc");
}
}
-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;
return 1;
}
- if(mdp1->heaplimit != mdp2->heaplimit){
- fprintf(stderr,"Different limit of valid info table indices\n");
- return 1;
- }
-
if(mdp1->fd != mdp2->fd){
fprintf(stderr,"Different file descriptor for the file to which this malloc heap is mapped\n");
return 1;
return 1;
}*/
- //void* heapbase1 = (char *)mdp1 + ((char *)mdp1->heapbase - (char *)s_heap);
- //void* heapbase2 = (char *)mdp2 + ((char *)mdp2->heapbase - (char *)s_heap);
+
+ if(mdp1->heaplimit != mdp2->heaplimit){
+ fprintf(stderr,"Different limit of valid info table indices\n");
+ return 1;
+ }
+
+ void* s_heap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
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);
+
size_t i, j;
void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2;
size_t frag_size = 0; /* FIXME: arbitrary initialization */
- /* size_t frag_size_pointed; FIXME: unused */
i = 1;
int k;
int distance = 0;
-
- void *end_heap = get_end_addr_heap(s_heap);
+ int total_distance = 0;
int pointer_align;
void *address_pointed1, *address_pointed2;
void *addr_block_pointed1, *addr_block_pointed2;
int frag_pointed1, frag_pointed2;
-
/* Check busy blocks*/
while(i < mdp1->heaplimit){
errors++;
}
- //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 = (char*)heapbase1 + ((i-1)*BLOCKSIZE);
+ xbt_assert(addr_block1 < breakval1, "Block address out of heap memory used");
- addr_block1 = heapbase1 + ((i-1)*BLOCKSIZE);
- addr_block2 = heapbase2 + ((i-1)*BLOCKSIZE);
+ addr_block2 = (char*)heapbase2 + ((i-1)*BLOCKSIZE);
+ xbt_assert(addr_block2 < breakval2, "Block address out of heap memory used");
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 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
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);
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 = 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;
}
errors++;
}
- //fprintf(stderr,"\n");
-
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] > 0){
addr_frag1 = (char *)addr_block1 + (j * frag_size);
- addr_frag2 = (char *)addr_block2 + (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;
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 < mdp1->breakval)) && ((address_pointed2 > (void *)s_heap) && (address_pointed2 < mdp2->breakval))){
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);
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 = 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;
}
i++;
- //fprintf(stderr,"\n");
-
}
}
}
- //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 */
- ssize_t read; /* Number of bytes readed */
- size_t n = 0; /* Amount of bytes to read by getline */
+/* 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");
+/* fp = fopen("/proc/self/maps", "r"); */
- if(fp == NULL)
- perror("fopen failed");
+/* if(fp == NULL) */
+/* perror("fopen failed"); */
- xbt_dynar_t lfields = NULL;
- xbt_dynar_t start_end = NULL;
- void *start_addr;
- void *end_addr;
+/* xbt_dynar_t lfields = NULL; */
+/* xbt_dynar_t start_end = NULL; */
+/* void *start_addr; */
+/* void *end_addr; */
- while ((read = getline(&line, &n, fp)) != -1) {
+/* while ((read = getline(&line, &n, fp)) != -1) { */
- xbt_str_trim(line, NULL);
- xbt_str_strip_spaces(line);
- lfields = xbt_str_split(line,NULL);
+/* xbt_str_trim(line, NULL); */
+/* xbt_str_strip_spaces(line); */
+/* lfields = xbt_str_split(line,NULL); */
- start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-");
- 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);
+/* start_end = xbt_str_split(xbt_dynar_get_as(lfields, 0, char*), "-"); */
+/* 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){
- free(line);
- fclose(fp);
- xbt_dynar_reset(lfields);
- xbt_free(lfields);
- xbt_dynar_reset(start_end);
- xbt_free(start_end);
- return end_addr;
- }
+/* if(start_addr == heap){ */
+/* free(line); */
+/* fclose(fp); */
+/* xbt_dynar_reset(lfields); */
+/* xbt_free(lfields); */
+/* xbt_dynar_reset(start_end); */
+/* xbt_free(start_end); */
+/* return end_addr; */
+/* } */
- }
+/* } */
- xbt_dynar_reset(lfields);
- xbt_free(lfields);
- xbt_dynar_reset(start_end);
- xbt_free(start_end);
- free(line);
- fclose(fp);
- return NULL;
+/* xbt_dynar_reset(lfields); */
+/* xbt_free(lfields); */
+/* xbt_dynar_reset(start_end); */
+/* xbt_free(start_end); */
+/* free(line); */
+/* fclose(fp); */
+/* return NULL; */
-}
+/* } */
void mmalloc_display_info_heap(xbt_mheap_t h){
