XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mm_diff, xbt,
"Logging specific to mm_diff in mmalloc");
-extern char *xbt_binary_name;
-
-xbt_dynar_t mmalloc_ignore;
+xbt_dynar_t mc_heap_comparison_ignore;
xbt_dynar_t stacks_areas;
-typedef struct s_heap_area_pair{
- int block1;
- int fragment1;
- int block2;
- int fragment2;
-}s_heap_area_pair_t, *heap_area_pair_t;
-
static void heap_area_pair_free(heap_area_pair_t pair);
static void heap_area_pair_free_voidp(void *d);
static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2);
static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2);
+static heap_area_t new_heap_area(int block, int fragment);
static int compare_area(void *area1, void* area2, size_t size, xbt_dynar_t previous, int check_ignore);
-static void match_equals(xbt_dynar_t list);
+static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals);
-static int in_mmalloc_ignore(int block, int fragment);
-static size_t heap_comparison_ignore(void *address);
+static int in_mc_comparison_ignore(int block, int fragment);
+static size_t heap_comparison_ignore_size(void *address);
+static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2);
+static void remove_heap_equality(xbt_dynar_t *equals, int address, void *a);
static char* is_stack(void *address);
xbt_ex_t e;
if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) {
- XBT_DEBUG("No backtrace available for that block, sorry.");
+ fprintf(stderr, "No backtrace available for that block, sorry.\n");
return;
}
xbt_ex_setup_backtrace(&e);
if (e.used == 0) {
- XBT_DEBUG("(backtrace not set)");
+ fprintf(stderr, "(backtrace not set)\n");
} else if (e.bt_strings == NULL) {
- XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+ fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
} else {
int i;
- XBT_DEBUG("Backtrace of where the block %d was malloced (%d frames):", block ,e.used);
+ fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used);
for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
- XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
+ fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4);
}
}
-
}
void mmalloc_backtrace_fragment_display(void* heapinfo, int block, int frag){
xbt_ex_setup_backtrace(&e);
if (e.used == 0) {
- XBT_DEBUG("(backtrace not set)");
+ fprintf(stderr, "(backtrace not set)\n");
} else if (e.bt_strings == NULL) {
- XBT_DEBUG("(backtrace not ready to be computed. %s)",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
+ fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet");
} else {
int i;
- XBT_DEBUG("Backtrace of where the fragment %d in block %d was malloced (%d frames):", frag, block ,e.used);
+ fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used);
for (i = 0; i < e.used; i++) /* no need to display "xbt_backtrace_display" */{
- XBT_DEBUG("%d ---> %s",i, e.bt_strings[i] + 4);
+ fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4);
}
}
}
-void *s_heap, *heapbase1, *heapbase2;
-malloc_info *heapinfo1, *heapinfo2;
-size_t heaplimit, heapsize1, heapsize2;
+void mmalloc_backtrace_display(void *addr){
-int ignore_done;
+ size_t block, frag_nb;
+ int type;
+
+ xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit();
+
+ block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1);
+
+ type = heap->heapinfo[block].type;
+
+ switch(type){
+ case -1 : /* Free block */
+ fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n");
+ xbt_abort();
+ break;
+ case 0: /* Large block */
+ mmalloc_backtrace_block_display(heap->heapinfo, block);
+ break;
+ default: /* Fragmented block */
+ frag_nb = RESIDUAL(addr, BLOCKSIZE) >> type;
+ if(heap->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){
+ fprintf(stderr , "Asked to display the backtrace of a fragment that is free. I'm puzzled\n");
+ xbt_abort();
+ }
+ mmalloc_backtrace_fragment_display(heap->heapinfo, block, frag_nb);
+ break;
+ }
+}
+
+
+void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL;
+malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL;
+size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0;
-int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stack1, xbt_dynar_t *stack2){
+int ignore_done = 0;
+
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t *stack1, xbt_dynar_t *stack2, xbt_dynar_t *equals){
if(heap1 == NULL && heap1 == NULL){
XBT_DEBUG("Malloc descriptors null");
xbt_dynar_t previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp);
- int equal, res_compare;
+ int equal, res_compare = 0;
- ignore_done = 0;
+ /* Init equal information */
+ i1 = 1;
+
+ while(i1<=heaplimit){
+ if(heapinfo1[i1].type == 0){
+ heapinfo1[i1].busy_block.equal_to = NULL;
+ }
+ if(heapinfo1[i1].type > 0){
+ for(j1=0; j1 < (size_t) (BLOCKSIZE >> heapinfo1[i1].type); j1++){
+ heapinfo1[i1].busy_frag.equal_to[j1] = NULL;
+ }
+ }
+ i1++;
+ }
+
+ i2 = 1;
+
+ while(i2<=heaplimit){
+ if(heapinfo2[i2].type == 0){
+ heapinfo2[i2].busy_block.equal_to = NULL;
+ }
+ if(heapinfo2[i2].type > 0){
+ for(j2=0; j2 < (size_t) (BLOCKSIZE >> heapinfo2[i2].type); j2++){
+ heapinfo2[i2].busy_frag.equal_to[j2] = NULL;
+ }
+ }
+ i2++;
+ }
/* Init equal information */
i1 = 1;
}
addr_block1 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)heapbase1));
+ real_addr_block1 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block1) - (char *)heapbase1);
if(heapinfo1[i1].type == 0){ /* Large block */
- real_addr_block1 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block1) - (char *)heapbase1);
-
if((stack_name = is_stack(real_addr_block1)) != NULL){
stack_region_t stack = xbt_new0(s_stack_region_t, 1);
stack->address = addr_block1;
stack->process_name = strdup(stack_name);
+ stack->size = heapinfo1[i1].busy_block.busy_size;
xbt_dynar_push(*stack1, &stack);
+ res_compare = -1;
}
if(heapinfo1[i1].busy_block.busy_size == 0){
i1++;
continue;
}
-
+
+ if(heapinfo1[i1].busy_block.equal_to != NULL){
+ i1++;
+ continue;
+ }
+
i2 = 1;
equal = 0;
-
+ res_compare = 0;
+
/* Try first to associate to same block in the other heap */
if(heapinfo2[current_block].type == heapinfo1[current_block].type){
-
- if(heapinfo1[current_block].busy_block.busy_size == heapinfo2[current_block].busy_block.busy_size){
- addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2));
+ if(heapinfo2[current_block].busy_block.equal_to == NULL){
+
+ if(heapinfo1[current_block].busy_block.busy_size == heapinfo2[current_block].busy_block.busy_size){
- real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2);
+ addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2));
+ real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2);
- if((stack_name = is_stack(real_addr_block2)) != NULL){
- stack_region_t stack = xbt_new0(s_stack_region_t, 1);
- stack->address = addr_block2;
- stack->process_name = strdup(stack_name);
- xbt_dynar_push(*stack2, &stack);
- }
-
+ if((stack_name = is_stack(real_addr_block2)) != NULL){
+ stack_region_t stack = xbt_new0(s_stack_region_t, 1);
+ stack->address = addr_block2;
+ stack->process_name = strdup(stack_name);
+ stack->size = heapinfo2[current_block].busy_block.busy_size;
+ xbt_dynar_push(*stack2, &stack);
+ res_compare = -1;
+ }
+
+ add_heap_area_pair(previous, current_block, -1, current_block, -1);
+
+ if(res_compare != -1){
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore((int)current_block, -1))
+ res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 1);
+ else
+ res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0);
+ }else{
+ res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0);
+ }
+ }
+
+ if(res_compare == 0 || res_compare == -1){
+ for(k=1; k < heapinfo2[current_block].busy_block.size; k++)
+ heapinfo2[current_block+k].busy_block.equal_to = new_heap_area(i1, -1);
+ for(k=1; k < heapinfo1[current_block].busy_block.size; k++)
+ heapinfo1[current_block+k].busy_block.equal_to = new_heap_area(i1, -1);
+ equal = 1;
+ match_equals(previous, equals);
+ i1 = i1 + heapinfo1[current_block].busy_block.size;
+ }
+
+ xbt_dynar_reset(previous);
- add_heap_area_pair(previous, current_block, -1, current_block, -1);
-
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore((int)current_block, -1))
- res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 1);
- else
- res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0);
- }else{
- res_compare = compare_area(addr_block1, addr_block2, heapinfo1[current_block].busy_block.busy_size, previous, 0);
- }
-
- if(res_compare == 0){
- for(k=1; k < heapinfo2[current_block].busy_block.size; k++)
- heapinfo2[current_block+k].busy_block.equal_to = 1 ;
- for(k=1; k < heapinfo1[current_block].busy_block.size; k++)
- heapinfo1[current_block+k].busy_block.equal_to = 1 ;
- equal = 1;
- match_equals(previous);
- i1 = i1 + heapinfo1[i1].busy_block.size;
}
- xbt_dynar_reset(previous);
-
}
-
+
}
while(i2 <= heaplimit && !equal){
- addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));
-
+ addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)heapbase2));
real_addr_block2 = (char*)((xbt_mheap_t)s_heap)->heapbase + (((char *)addr_block2) - (char *)heapbase2);
if((stack_name = is_stack(real_addr_block2)) != NULL){
stack_region_t stack = xbt_new0(s_stack_region_t, 1);
stack->address = addr_block2;
stack->process_name = strdup(stack_name);
+ stack->size = heapinfo2[i2].busy_block.busy_size;
xbt_dynar_push(*stack2, &stack);
+ res_compare = -1;
}
if(i2 == current_block){
continue;
}
- if(heapinfo2[i2].busy_block.equal_to == 1){
+ if(heapinfo2[i2].busy_block.equal_to != NULL){
i2++;
continue;
}
/* Comparison */
add_heap_area_pair(previous, i1, -1, i2, -1);
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore((int)i1, -1))
- res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 1);
- else
+ if(res_compare != -1){
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore((int)i1, -1))
+ res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 1);
+ else
+ res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0);
+ }else{
res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0);
- }else{
- res_compare = compare_area(addr_block1, addr_block2, heapinfo1[i1].busy_block.busy_size, previous, 0);
+ }
}
- if(!res_compare){
+ if(res_compare == 0 || res_compare == -1){
for(k=1; k < heapinfo2[i2].busy_block.size; k++)
- heapinfo2[i2+k].busy_block.equal_to = 1;
+ heapinfo2[i2+k].busy_block.equal_to = new_heap_area(i1, -1);
for(k=1; k < heapinfo1[i1].busy_block.size; k++)
- heapinfo1[i1+k].busy_block.equal_to = 1;
+ heapinfo1[i1+k].busy_block.equal_to = new_heap_area(i2, -1);
equal = 1;
- match_equals(previous);
+ match_equals(previous, equals);
+ i1 = i1 + heapinfo1[i1].busy_block.size;
}
xbt_dynar_reset(previous);
current_fragment = j1;
- if(heapinfo1[i1].busy_frag.frag_size[j1] == 0) /* Free fragment */
+ if(heapinfo1[i1].busy_frag.frag_size[j1] == -1) /* Free fragment */
continue;
-
+
+ if(heapinfo1[i1].busy_frag.equal_to[j1] != NULL)
+ continue;
+
addr_frag1 = (void*) ((char *)addr_block1 + (j1 << heapinfo1[i1].type));
i2 = 1;
/* Try first to associate to same fragment in the other heap */
if(heapinfo2[current_block].type == heapinfo1[current_block].type){
-
- if(heapinfo1[current_block].busy_frag.frag_size[current_fragment] == heapinfo2[current_block].busy_frag.frag_size[current_fragment]){
- addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2));
- addr_frag2 = (void*) ((char *)addr_block2 + (current_fragment << heapinfo2[current_block].type));
+ if(heapinfo2[current_block].busy_frag.equal_to[current_fragment] == NULL){
+
+ if(heapinfo1[current_block].busy_frag.frag_size[current_fragment] == heapinfo2[current_block].busy_frag.frag_size[current_fragment]){
- add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment);
+ addr_block2 = ((void*) (((ADDR2UINT(current_block)) - 1) * BLOCKSIZE + (char*)heapbase2));
+ addr_frag2 = (void*) ((char *)addr_block2 + (current_fragment << heapinfo2[current_block].type));
+
+ add_heap_area_pair(previous, current_block, current_fragment, current_block, current_fragment);
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore((int)current_block, (int)current_fragment))
- res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 1);
- else
- res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0);
- }else{
- res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0);
- }
-
- if(res_compare == 0){
- equal = 1;
- match_equals(previous);
- }
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore((int)current_block, (int)current_fragment))
+ res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 1);
+ else
+ res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0);
+ }else{
+ res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[current_block].busy_frag.frag_size[current_fragment], previous, 0);
+ }
+
+ if(res_compare == 0){
+ equal = 1;
+ match_equals(previous, equals);
+ }
- xbt_dynar_reset(previous);
+ xbt_dynar_reset(previous);
- }
+ }
- }
+ }
+ }
while(i2 <= heaplimit && !equal){
+
if(heapinfo2[i2].type <= 0){
i2++;
if(heapinfo2[i2].type == heapinfo1[i1].type && i2 == current_block && j2 == current_fragment)
continue;
- if(heapinfo2[i2].busy_frag.equal_to[j2] == 1)
+ if(heapinfo2[i2].busy_frag.equal_to[j2] != NULL)
continue;
if(heapinfo1[i1].busy_frag.frag_size[j1] != heapinfo2[i2].busy_frag.frag_size[j2]) /* Different size_used */
/* Comparison */
add_heap_area_pair(previous, i1, j1, i2, j2);
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore((int)i1, (int)j1))
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore((int)i1, (int)j1))
res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 1);
else
res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 0);
res_compare = compare_area(addr_frag1, addr_frag2, heapinfo1[i1].busy_frag.frag_size[j1], previous, 0);
}
- if(!res_compare){
+ if(res_compare == 0){
equal = 1;
- match_equals(previous);
- xbt_dynar_reset(previous);
+ match_equals(previous, equals);
break;
}
while(i<heaplimit){
if(heapinfo1[i].type == 0){
if(heapinfo1[i].busy_block.busy_size > 0){
- if(heapinfo1[i].busy_block.equal_to == -1){
+ if(heapinfo1[i].busy_block.equal_to == NULL){
if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block1, heapinfo1[i].busy_block.busy_size);
mmalloc_backtrace_block_display((void*)heapinfo1, i);
}
nb_diff1++;
+ }else{
+ xbt_free(heapinfo1[i].busy_block.equal_to);
}
}
}
if(heapinfo1[i].type > 0){
+ addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo1[i].type); j++){
if(heapinfo1[i].busy_frag.frag_size[j] > 0){
- if(heapinfo1[i].busy_frag.equal_to[j] == -1){
+ if(heapinfo1[i].busy_frag.equal_to[j] == NULL){
if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
- addr_block1 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase1));
addr_frag1 = (void*) ((char *)addr_block1 + (j << heapinfo1[i].type));
XBT_DEBUG("Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag1, heapinfo1[i].busy_frag.frag_size[j]);
mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j);
}
nb_diff1++;
+ }else{
+ xbt_free(heapinfo1[i].busy_frag.equal_to[j]);
}
}
}
i++;
}
- XBT_DEBUG("Different blocks or fragments in heap1 : %d\n", nb_diff1);
+ XBT_DEBUG("Different blocks or fragments in heap1 : %d", nb_diff1);
i = 1;
while(i<heaplimit){
if(heapinfo2[i].type == 0){
if(heapinfo2[i].busy_block.busy_size > 0){
- if(heapinfo2[i].busy_block.equal_to == -1){
+ if(heapinfo2[i].busy_block.equal_to == NULL){
if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
XBT_DEBUG("Block %zu (%p) not found (size used = %zu)", i, addr_block2, heapinfo2[i].busy_block.busy_size);
mmalloc_backtrace_block_display((void*)heapinfo2, i);
}
nb_diff2++;
+ }else{
+ xbt_free(heapinfo2[i].busy_block.equal_to);
}
}
}
if(heapinfo2[i].type > 0){
+ addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
for(j=0; j < (size_t) (BLOCKSIZE >> heapinfo2[i].type); j++){
if(heapinfo2[i].busy_frag.frag_size[j] > 0){
- if(heapinfo2[i].busy_frag.equal_to[j] == -1){
+ if(heapinfo2[i].busy_frag.equal_to[j] == NULL){
if(XBT_LOG_ISENABLED(mm_diff, xbt_log_priority_debug)){
- addr_block2 = ((void*) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + (char*)heapbase2));
addr_frag2 = (void*) ((char *)addr_block2 + (j << heapinfo2[i].type));
XBT_DEBUG( "Block %zu, Fragment %zu (%p) not found (size used = %d)", i, j, addr_frag2, heapinfo2[i].busy_frag.frag_size[j]);
mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j);
}
nb_diff2++;
+ }else{
+ xbt_free(heapinfo2[i].busy_frag.equal_to[j]);
}
}
}
i++;
}
- XBT_DEBUG("Different blocks or fragments in heap2 : %d\n", nb_diff2);
+ XBT_DEBUG("Different blocks or fragments in heap2 : %d", nb_diff2);
xbt_dynar_free(&previous);
-
+ ignore_done = 0;
+ s_heap = NULL, heapbase1 = NULL, heapbase2 = NULL;
+ heapinfo1 = NULL, heapinfo2 = NULL;
+ heaplimit = 0, heapsize1 = 0, heapsize2 = 0;
+
return ((nb_diff1 > 0) || (nb_diff2 > 0));
+}
+static heap_area_t new_heap_area(int block, int fragment){
+ heap_area_t area = NULL;
+ area = xbt_new0(s_heap_area_t, 1);
+ area->block = block;
+ area->fragment = fragment;
+ return area;
}
-static int in_mmalloc_ignore(int block, int fragment){
+static int in_mc_comparison_ignore(int block, int fragment){
unsigned int cursor = 0;
int start = 0;
- int end = xbt_dynar_length(mmalloc_ignore) - 1;
- mc_ignore_region_t region;
+ int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
+ mc_heap_ignore_region_t region;
while(start <= end){
cursor = (start + end) / 2;
- region = (mc_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t);
+ region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
if(region->block == block){
if(region->fragment == fragment)
return 1;
return 0;
}
-static size_t heap_comparison_ignore(void *address){
+static size_t heap_comparison_ignore_size(void *address){
unsigned int cursor = 0;
int start = 0;
- int end = xbt_dynar_length(mmalloc_ignore) - 1;
- mc_ignore_region_t region;
+ int end = xbt_dynar_length(mc_heap_comparison_ignore) - 1;
+ mc_heap_ignore_region_t region;
while(start <= end){
cursor = (start + end) / 2;
- region = (mc_ignore_region_t)xbt_dynar_get_as(mmalloc_ignore, cursor, mc_ignore_region_t);
+ region = (mc_heap_ignore_region_t)xbt_dynar_get_as(mc_heap_comparison_ignore, cursor, mc_heap_ignore_region_t);
if(region->address == address)
return region->size;
if(region->address < address)
if(check_ignore){
current_area1 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area1) + i) - (char *)heapbase1);
- if((ignore1 = heap_comparison_ignore(current_area1)) > 0){
+ if((ignore1 = heap_comparison_ignore_size(current_area1)) > 0){
current_area2 = (char*)((xbt_mheap_t)s_heap)->heapbase + ((((char *)area2) + i) - (char *)heapbase2);
- if((ignore2 = heap_comparison_ignore(current_area2)) == ignore1){
+ if((ignore2 = heap_comparison_ignore_size(current_area2)) == ignore1){
i = i + ignore2;
ignore_done++;
continue;
if(add_heap_area_pair(previous, block_pointed1, -1, block_pointed2, -1)){
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore(block_pointed1, -1))
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore(block_pointed1, -1))
res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 1);
else
res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 0);
res_compare = compare_area(addr_block_pointed1, addr_block_pointed2, heapinfo1[block_pointed1].busy_block.busy_size, previous, 0);
}
- if(res_compare)
+ if(res_compare == 1)
return 1;
}
if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore(block_pointed1, frag_pointed1))
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore(block_pointed1, frag_pointed1))
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1);
else
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
}
- if(res_compare)
+ if(res_compare == 1)
return 1;
}
frag_pointed1 = ((uintptr_t) (ADDR2UINT (address_pointed1) % (BLOCKSIZE))) >> heapinfo1[block_pointed1].type;
frag_pointed2 = ((uintptr_t) (ADDR2UINT (address_pointed2) % (BLOCKSIZE))) >> heapinfo2[block_pointed2].type;
- if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */
+ if(heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1] != heapinfo2[block_pointed2].busy_frag.frag_size[frag_pointed2]) /* Different size_used */
return 1;
addr_frag_pointed1 = (void*) ((char *)addr_block_pointed1 + (frag_pointed1 << heapinfo1[block_pointed1].type));
if(add_heap_area_pair(previous, block_pointed1, frag_pointed1, block_pointed2, frag_pointed2)){
- if(ignore_done < xbt_dynar_length(mmalloc_ignore)){
- if(in_mmalloc_ignore(block_pointed1, frag_pointed1))
+ if(ignore_done < xbt_dynar_length(mc_heap_comparison_ignore)){
+ if(in_mc_comparison_ignore(block_pointed1, frag_pointed1))
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 1);
else
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
res_compare = compare_area(addr_frag_pointed1, addr_frag_pointed2, heapinfo1[block_pointed1].busy_frag.frag_size[frag_pointed1], previous, 0);
}
- if(res_compare)
+ if(res_compare == 1)
return 1;
}
return 1;
}
-static void match_equals(xbt_dynar_t list){
+static void match_equals(xbt_dynar_t list, xbt_dynar_t *equals){
unsigned int cursor = 0;
heap_area_pair_t current_pair;
+ heap_area_t previous_area;
+
+ void *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2;
xbt_dynar_foreach(list, cursor, current_pair){
+
if(current_pair->fragment1 != -1){
- heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = 1;
- heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = 1;
+
+ real_addr_block1 = ((void*) (((ADDR2UINT((size_t)current_pair->block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+ real_addr_frag1 = (void*) ((char *)real_addr_block1 + (current_pair->fragment1 << heapinfo1[current_pair->block1].type));
+ real_addr_block2 = ((void*) (((ADDR2UINT((size_t)current_pair->block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+ real_addr_frag2 = (void*) ((char *)real_addr_block2 + (current_pair->fragment2 << heapinfo2[current_pair->block2].type));
+
+ if(heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] != NULL){
+ remove_heap_equality(equals, 1, real_addr_frag1);
+ previous_area = heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1];
+ xbt_free( heapinfo2[previous_area->block].busy_frag.equal_to[previous_area->fragment]);
+ heapinfo2[previous_area->block].busy_frag.equal_to[previous_area->fragment] = NULL;
+ xbt_free(heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1]);
+ }
+ if(heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] != NULL){
+ remove_heap_equality(equals, 2, real_addr_frag2);
+ previous_area = heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2];
+ xbt_free(heapinfo1[previous_area->block].busy_frag.equal_to[previous_area->fragment]);
+ heapinfo1[previous_area->block].busy_frag.equal_to[previous_area->fragment] = NULL;
+ xbt_free(heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2]);
+ }
+
+ if(real_addr_frag1 != real_addr_frag2)
+ add_heap_equality(equals, real_addr_frag1, real_addr_frag2);
+
+ heapinfo1[current_pair->block1].busy_frag.equal_to[current_pair->fragment1] = new_heap_area(current_pair->block2, current_pair->fragment2);
+ heapinfo2[current_pair->block2].busy_frag.equal_to[current_pair->fragment2] = new_heap_area(current_pair->block1, current_pair->fragment1);
+
}else{
- heapinfo1[current_pair->block1].busy_block.equal_to = 1;
- heapinfo2[current_pair->block2].busy_block.equal_to = 1;
+
+ real_addr_block1 = ((void*) (((ADDR2UINT((size_t)current_pair->block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+ real_addr_block2 = ((void*) (((ADDR2UINT((size_t)current_pair->block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
+
+ if(heapinfo1[current_pair->block1].busy_block.equal_to != NULL){
+ remove_heap_equality(equals, 1, real_addr_block1);
+ previous_area = heapinfo1[current_pair->block1].busy_block.equal_to;
+ xbt_free(heapinfo2[previous_area->block].busy_block.equal_to);
+ heapinfo2[previous_area->block].busy_block.equal_to = NULL;
+ xbt_free(heapinfo1[current_pair->block1].busy_block.equal_to);
+ }
+ if(heapinfo2[current_pair->block2].busy_block.equal_to != NULL){
+ remove_heap_equality(equals, 2, real_addr_block2);
+ previous_area = heapinfo2[current_pair->block2].busy_block.equal_to;
+ xbt_free(heapinfo1[previous_area->block].busy_block.equal_to);
+ heapinfo1[previous_area->block].busy_block.equal_to = NULL;
+ xbt_free(heapinfo2[current_pair->block2].busy_block.equal_to);
+ }
+
+ if(real_addr_block1 != real_addr_block2)
+ add_heap_equality(equals, real_addr_block1, real_addr_block2);
+
+ heapinfo1[current_pair->block1].busy_block.equal_to = new_heap_area(current_pair->block2, current_pair->fragment2);
+ heapinfo2[current_pair->block2].busy_block.equal_to = new_heap_area(current_pair->block1, current_pair->fragment1);
+
}
}
+
}
#ifndef max
- #define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
+#define max( a, b ) ( ((a) > (b)) ? (a) : (b) )
#endif
int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
return NULL;
}
+
+static void add_heap_equality(xbt_dynar_t *equals, void *a1, void *a2){
+
+ if(xbt_dynar_is_empty(*equals)){
+
+ heap_equality_t he = xbt_new0(s_heap_equality_t, 1);
+ he->address1 = a1;
+ he->address2 = a2;
+
+ xbt_dynar_insert_at(*equals, 0, &he);
+
+ }else{
+
+ unsigned int cursor = 0;
+ int start = 0;
+ int end = xbt_dynar_length(*equals) - 1;
+ heap_equality_t current_equality = NULL;
+
+ while(start <= end){
+ cursor = (start + end) / 2;
+ current_equality = (heap_equality_t)xbt_dynar_get_as(*equals, cursor, heap_equality_t);
+ if(current_equality->address1 == a1){
+ if(current_equality->address2 == a2)
+ return;
+ if(current_equality->address2 < a2)
+ start = cursor + 1;
+ if(current_equality->address2 > a2)
+ end = cursor - 1;
+ }
+ if(current_equality->address1 < a1)
+ start = cursor + 1;
+ if(current_equality->address1 > a1)
+ end = cursor - 1;
+ }
+
+ heap_equality_t he = xbt_new0(s_heap_equality_t, 1);
+ he->address1 = a1;
+ he->address2 = a2;
+
+ if(current_equality->address1 < a1)
+ xbt_dynar_insert_at(*equals, cursor + 1 , &he);
+ else
+ xbt_dynar_insert_at(*equals, cursor, &he);
+
+ }
+
+}
+
+static void remove_heap_equality(xbt_dynar_t *equals, int address, void *a){
+
+ unsigned int cursor = 0;
+ heap_equality_t current_equality;
+ int found = 0;
+
+ if(address == 1){
+
+ int start = 0;
+ int end = xbt_dynar_length(*equals) - 1;
+
+
+ while(start <= end && found == 0){
+ cursor = (start + end) / 2;
+ current_equality = (heap_equality_t)xbt_dynar_get_as(*equals, cursor, heap_equality_t);
+ if(current_equality->address1 == a)
+ found = 1;
+ if(current_equality->address1 < a)
+ start = cursor + 1;
+ if(current_equality->address1 > a)
+ end = cursor - 1;
+ }
+
+ if(found == 1)
+ xbt_dynar_remove_at(*equals, cursor, NULL);
+
+ }else{
+
+ xbt_dynar_foreach(*equals, cursor, current_equality){
+ if(current_equality->address2 == a){
+ found = 1;
+ break;
+ }
+ }
+
+ if(found == 1)
+ xbt_dynar_remove_at(*equals, cursor, NULL);
+
+ }
+
+
+}
+
+int is_free_area(void *area, xbt_mheap_t heap){
+
+ void *sheap = (char *)mmalloc_get_current_heap() - STD_HEAP_SIZE - getpagesize();
+ malloc_info *heapinfo = (malloc_info *)((char *)heap + ((uintptr_t)((char *)heap->heapinfo - (char *)sheap)));
+ size_t heapsize = heap->heapsize;
+
+ /* Get block number */
+ size_t block = ((char*)area - (char*)((xbt_mheap_t)sheap)->heapbase) / BLOCKSIZE + 1;
+ size_t fragment;
+
+ /* Check if valid block number */
+ if((char *)area < (char*)((xbt_mheap_t)sheap)->heapbase || block > heapsize || block < 1)
+ return 0;
+
+ if(heapinfo[block].type < 0)
+ return 1;
+
+ if(heapinfo[block].type == 0)
+ return 0;
+
+ if(heapinfo[block].type > 0){
+ fragment = ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type;
+ if(heapinfo[block].busy_frag.frag_size[fragment] == 0)
+ return 1;
+ }
+
+ return 0;
+
+
+
+}
