X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/8be7ea3f9e71cd563e91b6aba63f5c70f043fbd5..4f17c639fb7c5e45bdece89eb9cc8238a70e36b1:/src/xbt/mmalloc/mm_diff.c diff --git a/src/xbt/mmalloc/mm_diff.c b/src/xbt/mmalloc/mm_diff.c index e0141b5b86..c9154e0e84 100644 --- a/src/xbt/mmalloc/mm_diff.c +++ b/src/xbt/mmalloc/mm_diff.c @@ -130,11 +130,14 @@ static int compare_backtrace(int b1, int f1, int b2, int f2){ /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ +typedef char* type_name; + __thread void *s_heap = NULL, *heapbase1 = NULL, *heapbase2 = NULL; __thread malloc_info *heapinfo1 = NULL, *heapinfo2 = NULL; __thread size_t heaplimit = 0, heapsize1 = 0, heapsize2 = 0; __thread xbt_dynar_t to_ignore1 = NULL, to_ignore2 = NULL; __thread heap_area_t **equals_to1, **equals_to2; +__thread type_name **types1, **types2; /*********************************** Free functions ************************************/ @@ -194,7 +197,7 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int b return 0; } -static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ +static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address){ unsigned int cursor = 0; int start = 0; @@ -212,7 +215,7 @@ static size_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, void *address end = cursor - 1; } - return 0; + return -1; } static int is_stack(void *address){ @@ -328,18 +331,25 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, to_ignore2 = i2; equals_to1 = malloc(heaplimit * sizeof(heap_area_t *)); + types1 = malloc(heaplimit * sizeof(type_name *)); for(i=0; i<=heaplimit; i++){ equals_to1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t)); - for(j=0; jheapbase)); - res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, all_types, other_types, NULL, 0); - if(res_compare == 0){ + if(res_compare != 1){ for(k=1; k < heapinfo2[i1].busy_block.size; k++) equals_to2[i1+k][0] = new_heap_area(i1, -1); for(k=1; k < heapinfo1[i1].busy_block.size; k++) @@ -477,9 +500,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ continue; } - res_compare = compare_heap_area(addr_block1, addr_block2, NULL, NULL, NULL, NULL, 0); + res_compare = compare_heap_area(addr_block1, addr_block2, NULL, all_types, other_types, NULL, 0); - if(res_compare == 0){ + if(res_compare != 1 ){ for(k=1; k < heapinfo2[i2].busy_block.size; k++) equals_to2[i2+k][0] = new_heap_area(i1, -1); for(k=1; k < heapinfo1[i1].busy_block.size; k++) @@ -524,9 +547,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); addr_frag2 = (void*) ((char *)addr_block2 + (j1 << ((xbt_mheap_t)s_heap)->heapinfo[i1].type)); - res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); + res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, all_types, other_types, NULL, 0); - if(res_compare == 0) + if(res_compare != 1) equal = 1; xbt_dynar_reset(previous); @@ -553,9 +576,9 @@ int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){ addr_block2 = ((void*) (((ADDR2UINT(i2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); addr_frag2 = (void*) ((char *)addr_block2 + (j2 <<((xbt_mheap_t)s_heap)->heapinfo[i2].type)); - res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, NULL, NULL, NULL, 0); + res_compare = compare_heap_area(addr_frag1, addr_frag2, NULL, all_types, other_types, NULL, 0); - if(res_compare == 0){ + if(res_compare != 1){ equal = 1; xbt_dynar_reset(previous); break; @@ -681,16 +704,22 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo int i = 0; void *addr_pointed1, *addr_pointed2; - int pointer_align, ignore1, ignore2, res_compare; + int pointer_align, res_compare; + ssize_t ignore1, ignore2; while(i 0){ - if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)real_area1 + i)) > 0){ + if((ignore1 = heap_comparison_ignore_size(to_ignore1, (char *)real_area1 + i)) != -1){ if((ignore2 = heap_comparison_ignore_size(to_ignore2, (char *)real_area2 + i)) == ignore1){ - i = i + ignore2; - check_ignore--; - continue; + if(ignore1 == 0){ + check_ignore--; + return 0; + }else{ + i = i + ignore2; + check_ignore--; + continue; + } } } } @@ -707,8 +736,9 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo }else if((addr_pointed1 > s_heap) && ((char *)addr_pointed1 < (char *)s_heap + STD_HEAP_SIZE) && (addr_pointed2 > s_heap) && ((char *)addr_pointed2 < (char *)s_heap + STD_HEAP_SIZE)){ res_compare = compare_heap_area(addr_pointed1, addr_pointed2, previous, all_types, other_types, NULL, 0); - if(res_compare == 1) + if(res_compare == 1){ return res_compare; + } i = pointer_align + sizeof(void *); continue; }else{ @@ -725,7 +755,7 @@ static int compare_heap_area_without_type(void *real_area1, void *real_area2, vo } - +// area_size is either a byte_size or an elements_count?& static int compare_heap_area_with_type(void *real_area1, void *real_area2, void *area1, void *area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id, int area_size, int check_ignore, int pointer_level){ @@ -733,10 +763,11 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void if(is_stack(real_area1) && is_stack(real_area2)) return 0; - size_t ignore1, ignore2; + ssize_t ignore1, ignore2; - if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) + if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)){ return 0; + } dw_type_t type = xbt_dict_get_or_null(all_types, type_id); dw_type_t subtype, subsubtype; @@ -747,41 +778,40 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void char *type_desc; switch(type->type){ - case e_dw_base_type: - if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) - return 0; - if(strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */ - return (memcmp(area1, area2, area_size) != 0); - }else{ - if(area_size != -1 && type->size != area_size) + case DW_TAG_base_type: + if(type->name!=NULL && strcmp(type->name, "char") == 0){ /* String, hence random (arbitrary ?) size */ + if(real_area1 == real_area2) return -1; else - return (memcmp(area1, area2, type->size) != 0); + return (memcmp(area1, area2, area_size) != 0); + }else{ + if(area_size != -1 && type->byte_size != area_size) + return -1; + else{ + return (memcmp(area1, area2, type->byte_size) != 0); + } } break; - case e_dw_enumeration_type: - if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) - return 0; - if(area_size != -1 && type->size != area_size) + case DW_TAG_enumeration_type: + if(area_size != -1 && type->byte_size != area_size) return -1; else - return (memcmp(area1, area2, type->size) != 0); + return (memcmp(area1, area2, type->byte_size) != 0); break; - case e_dw_typedef: + case DW_TAG_typedef: + case DW_TAG_const_type: + case DW_TAG_volatile_type: return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); break; - case e_dw_const_type: - return 0; - break; - case e_dw_array_type: + case DW_TAG_array_type: subtype = xbt_dict_get_or_null(all_types, type->dw_type_id); switch(subtype->type){ - case e_dw_base_type: - case e_dw_enumeration_type: - case e_dw_pointer_type: - case e_dw_structure_type: - case e_dw_union_type: - if(subtype->size == 0){ /*declaration of the type, need the complete description */ + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_structure_type: + case DW_TAG_union_type: + if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subtype->name); if(type_desc){ subtype = xbt_dict_get_or_null(all_types, type_desc); @@ -790,12 +820,14 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - elm_size = subtype->size; + elm_size = subtype->byte_size; break; - case e_dw_typedef: - case e_dw_volatile_type: + // TODO, just remove the type indirection? + case DW_TAG_const_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: subsubtype = xbt_dict_get_or_null(all_types, subtype->dw_type_id); - if(subsubtype->size == 0){ /*declaration of the type, need the complete description */ + if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ type_desc = get_type_description(all_types, subsubtype->name); if(type_desc){ subsubtype = xbt_dict_get_or_null(all_types, type_desc); @@ -804,30 +836,31 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - elm_size = subsubtype->size; + elm_size = subsubtype->byte_size; break; default : return 0; break; } - for(i=0; isize; i++){ + for(i=0; ielement_count; i++){ + // TODO, add support for variable stride (DW_AT_byte_stride) if(switch_types) - res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, type->size, check_ignore, pointer_level); + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, other_types, all_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level); else - res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, type->size, check_ignore, pointer_level); + res = compare_heap_area_with_type((char *)real_area1 + (i*elm_size), (char *)real_area2 + (i*elm_size), (char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), previous, all_types, other_types, type->dw_type_id, subtype->byte_size, check_ignore, pointer_level); if(res == 1) return res; } break; - case e_dw_pointer_type: - if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(all_types, type->dw_type_id))->type == e_dw_subroutine_type){ + case DW_TAG_pointer_type: + if(type->dw_type_id && ((dw_type_t)xbt_dict_get_or_null(all_types, type->dw_type_id))->type == DW_TAG_subroutine_type){ addr_pointed1 = *((void **)(area1)); addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2);; }else{ pointer_level++; if(pointer_level > 1){ /* Array of pointers */ - for(i=0; i<(area_size/sizeof(void *)); i++){ + for(i=0; i<(area_size/sizeof(void *)); i++){ addr_pointed1 = *((void **)((char *)area1 + (i*sizeof(void *)))); addr_pointed2 = *((void **)((char *)area2 + (i*sizeof(void *)))); if(addr_pointed1 > s_heap && (char *)addr_pointed1 < (char*) s_heap + STD_HEAP_SIZE && addr_pointed2 > s_heap && (char *)addr_pointed2 < (char*) s_heap + STD_HEAP_SIZE) @@ -847,8 +880,8 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } } break; - case e_dw_structure_type: - if(type->size == 0){ /*declaration of the structure, need the complete description */ + case DW_TAG_structure_type: + if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ type_desc = get_type_description(all_types, type->name); if(type_desc){ type = xbt_dict_get_or_null(all_types, type_desc); @@ -857,13 +890,13 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void switch_types = 1; } } - if(area_size != -1 && type->size != area_size){ - if(area_size>type->size && area_size%type->size == 0){ - for(i=0; i<(area_size/type->size); i++){ + if(area_size != -1 && type->byte_size != area_size){ + if(area_size>type->byte_size && area_size%type->byte_size == 0){ + for(i=0; i<(area_size/type->byte_size); i++){ if(switch_types) - res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, other_types, all_types, type_id, -1, check_ignore, 0); + res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, other_types, all_types, type_id, -1, check_ignore, 0); else - res = compare_heap_area_with_type((char *)real_area1 + (i*type->size), (char *)real_area2 + (i*type->size), (char *)area1 + (i*type->size), (char *)area2 + (i*type->size), previous, all_types, other_types, type_id, -1, check_ignore, 0); + res = compare_heap_area_with_type((char *)real_area1 + (i*type->byte_size), (char *)real_area2 + (i*type->byte_size), (char *)area1 + (i*type->byte_size), (char *)area2 + (i*type->byte_size), previous, all_types, other_types, type_id, -1, check_ignore, 0); if(res == 1) return res; } @@ -872,23 +905,19 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } }else{ cursor = 0; - xbt_dynar_foreach(type->members, cursor, member){ + xbt_dynar_foreach(type->members, cursor, member){ if(switch_types) res = compare_heap_area_with_type((char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, other_types, all_types, member->dw_type_id, -1, check_ignore, 0); else res = compare_heap_area_with_type((char *)real_area1 + member->offset, (char *)real_area2 + member->offset, (char *)area1 + member->offset, (char *)area2 + member->offset, previous, all_types, other_types, member->dw_type_id, -1, check_ignore, 0); - if(res == 1) + if(res == 1){ return res; + } } } break; - case e_dw_union_type: - if((check_ignore > 0) && ((ignore1 = heap_comparison_ignore_size(to_ignore1, real_area1)) > 0) && ((ignore2 = heap_comparison_ignore_size(to_ignore2, real_area2)) == ignore1)) - return 0; - return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->size, check_ignore); - break; - case e_dw_volatile_type: - return compare_heap_area_with_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->dw_type_id, area_size, check_ignore, pointer_level); + case DW_TAG_union_type: + return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->byte_size, check_ignore); break; default: break; @@ -898,6 +927,57 @@ static int compare_heap_area_with_type(void *real_area1, void *real_area2, void } +static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xbt_dict_t other_types, int area_size, int *switch_type){ + dw_type_t type = xbt_dict_get_or_null(all_types, type_id); + if(type == NULL){ + type = xbt_dict_get_or_null(other_types, type_id); + *switch_type = 1; + } + char* type_desc; + switch(type->type){ + case DW_TAG_structure_type : + if(type->byte_size == 0){ /*declaration of the structure, need the complete description */ + if(*switch_type == 0){ + type_desc = get_type_description(all_types, type->name); + if(type_desc){ + type = xbt_dict_get_or_null(all_types, type_desc); + }else{ + type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); + *switch_type = 1; + } + }else{ + type_desc = get_type_description(other_types, type->name); + if(type_desc){ + type = xbt_dict_get_or_null(other_types, type_desc); + }else{ + type = xbt_dict_get_or_null(all_types, get_type_description(other_types, type->name)); + *switch_type = 0; + } + } + + } + if(area_size != -1 && type->byte_size != area_size){ + if(area_size>type->byte_size && area_size%type->byte_size == 0) + return type_id; + else + return NULL; + }else{ + unsigned int cursor = 0; + dw_type_t member; + xbt_dynar_foreach(type->members, cursor, member){ + if(member->offset == offset) + return member->dw_type_id; + } + return NULL; + } + break; + default: + /* FIXME : other cases ? */ + return NULL; + break; + } +} + int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t all_types, xbt_dict_t other_types, char *type_id, int pointer_level){ int res_compare; @@ -905,10 +985,15 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t ssize_t size; int check_ignore = 0; - void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; + void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2, *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2; void *area1_to_compare, *area2_to_compare; dw_type_t type = NULL; char *type_desc; + int type_size = -1; + int offset1 =0, offset2 = 0; + int new_size1 = -1, new_size2 = -1; + char *new_type_id1 = NULL, *new_type_id2 = NULL; + int switch_type = 0; int match_pairs = 0; @@ -938,6 +1023,28 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)heapbase1)); addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)heapbase2)); + + real_addr_block1 = ((void*) (((ADDR2UINT(block1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + real_addr_block2 = ((void*) (((ADDR2UINT(block2)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase)); + + if(type_id){ + type = xbt_dict_get_or_null(all_types, type_id); + if(type->byte_size == 0){ + if(type->dw_type_id == NULL){ + type_desc = get_type_description(all_types, type->name); + if(type_desc) + type = xbt_dict_get_or_null(all_types, type_desc); + else + type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); + }else{ + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + } + } + if((type->byte_size == DW_TAG_pointer_type) || ((type->type == DW_TAG_base_type) && type->name!=NULL && (!strcmp(type->name, "char")))) + type_size = -1; + else + type_size = type->byte_size; + } if((heapinfo1[block1].type == -1) && (heapinfo2[block2].type == -1)){ /* Free block */ @@ -947,8 +1054,8 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } return 0; - }else if((heapinfo1[block1].type == 0) && (heapinfo2[block2].type == 0)){ /* Complete block */ - + }else if((heapinfo1[block1].type == 0) && (heapinfo2[block2].type == 0)){ /* Complete block */ + if(equals_to1[block1][0] != NULL && equals_to2[block2][0] != NULL){ if(equal_blocks(block1, block2)){ if(match_pairs){ @@ -959,24 +1066,13 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } } - if(type_id){ - type = xbt_dict_get_or_null(all_types, type_id); - if(strcmp(type->name, "char") ==0){ - if(area1 == area2) - return -1; - } - if(type->size == 0){ - type_desc = get_type_description(all_types, type->name); - if(type_desc) - type = xbt_dict_get_or_null(all_types, type_desc); - else - type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); - } - if(strcmp(type->name, "s_smx_context") != 0){ - if(type->size > 0){ - if(heapinfo1[block1].busy_block.busy_size != type->size && heapinfo2[block2].busy_block.busy_size != type->size) - return -1; + if(type_size != -1){ + if(type_size != heapinfo1[block1].busy_block.busy_size && type_size != heapinfo2[block2].busy_block.busy_size && type->name!=NULL && !strcmp(type->name, "s_smx_context")){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); } + return -1; } } @@ -1003,6 +1099,13 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } size = heapinfo1[block1].busy_block.busy_size; + + if(type_id != NULL){ + xbt_free(types1[block1][0]); + xbt_free(types2[block2][0]); + types1[block1][0] = strdup(type_id); + types2[block2][0] = strdup(type_id); + } if(size <= 0){ if(match_pairs){ @@ -1025,33 +1128,27 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t frag1 = ((uintptr_t) (ADDR2UINT (area1) % (BLOCKSIZE))) >> heapinfo1[block1].type; frag2 = ((uintptr_t) (ADDR2UINT (area2) % (BLOCKSIZE))) >> heapinfo2[block2].type; - + addr_frag1 = (void*) ((char *)addr_block1 + (frag1 << heapinfo1[block1].type)); addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << heapinfo2[block2].type)); - - area1_to_compare = addr_frag1; - area2_to_compare = addr_frag2; - - if(type_id){ - type = xbt_dict_get_or_null(all_types, type_id); - if(strcmp(type->name, "char") ==0){ - if(area1 == area2) - return -1; - } - if(type->size == 0 || type->type == e_dw_pointer_type){ - if(!type->dw_type_id){ - type_desc = get_type_description(all_types, type->name); - if(type_desc) - type = xbt_dict_get_or_null(all_types, type_desc); - else - type = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name)); - }else{ - type = xbt_dict_get_or_null(all_types, type->dw_type_id); + + real_addr_frag1 = (void*) ((char *)real_addr_block1 + (frag1 << ((xbt_mheap_t)s_heap)->heapinfo[block1].type)); + real_addr_frag2 = (void*) ((char *)real_addr_block2 + (frag2 << ((xbt_mheap_t)s_heap)->heapinfo[block2].type)); + + if(type_size != -1){ + if(heapinfo1[block1].busy_frag.frag_size[frag1] == -1 || heapinfo2[block2].busy_frag.frag_size[frag2] == -1){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); } + return -1; } - if(type->size > 0){ - if(heapinfo1[block1].busy_frag.frag_size[frag1] != type->size || heapinfo2[block2].busy_frag.frag_size[frag2] != type->size) - return -1; + if(type_size != heapinfo1[block1].busy_frag.frag_size[frag1] || type_size != heapinfo2[block2].busy_frag.frag_size[frag2]){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return -1; } } @@ -1066,21 +1163,95 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t } if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){ - if(match_pairs){ - xbt_dynar_free(&previous); + if(type_size == -1){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return -1; + }else{ + if(match_pairs){ + xbt_dynar_free(&previous); + } + return 1; } - return 1; } - if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ - if(match_pairs){ - match_equals(previous); - xbt_dynar_free(&previous); + size = heapinfo1[block1].busy_frag.frag_size[frag1]; + + if(type_id != NULL){ + xbt_free(types1[block1][frag1]); + xbt_free(types2[block2][frag2]); + types1[block1][frag1] = strdup(type_id); + types2[block2][frag2] = strdup(type_id); + } + + if(real_addr_frag1 != area1 || real_addr_frag2 != area2){ + offset1 = (char *)area1 - (char *)real_addr_frag1; + offset2 = (char *)area2 - (char *)real_addr_frag2; + if(types1[block1][frag1] != NULL && types2[block2][frag2] != NULL){ + new_type_id1 = get_offset_type(types1[block1][frag1], offset1, all_types, other_types, size, &switch_type); + new_type_id2 = get_offset_type(types2[block2][frag2], offset1, all_types, other_types, size, &switch_type); + }else if(types1[block1][frag1] != NULL){ + new_type_id1 = get_offset_type(types1[block1][frag1], offset1, all_types, other_types, size, &switch_type); + new_type_id2 = get_offset_type(types1[block1][frag1], offset2, all_types, other_types, size, &switch_type); + }else if(types2[block2][frag2] != NULL){ + new_type_id1 = get_offset_type(types2[block2][frag2], offset1, all_types, other_types, size, &switch_type); + new_type_id2 = get_offset_type(types2[block2][frag2], offset2, all_types, other_types, size, &switch_type); + }else{ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return -1; + } + + if(new_type_id1 != NULL && new_type_id2 != NULL && !strcmp(new_type_id1, new_type_id2)){ + if(switch_type){ + type = xbt_dict_get_or_null(other_types, new_type_id1); + while(type->byte_size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(other_types, type->dw_type_id); + new_size1 = type->byte_size; + type = xbt_dict_get_or_null(other_types, new_type_id2); + while(type->byte_size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(other_types, type->dw_type_id); + new_size2 = type->byte_size; + }else{ + type = xbt_dict_get_or_null(all_types, new_type_id1); + while(type->byte_size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + new_size1 = type->byte_size; + type = xbt_dict_get_or_null(all_types, new_type_id2); + while(type->byte_size == 0 && type->dw_type_id != NULL) + type = xbt_dict_get_or_null(all_types, type->dw_type_id); + new_size2 = type->byte_size; + } + }else{ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return -1; } - return 0; } - size = heapinfo1[block1].busy_frag.frag_size[frag1]; + area1_to_compare = (char *)addr_frag1 + offset1; + area2_to_compare = (char *)addr_frag2 + offset2; + + if(new_size1 > 0 && new_size1 == new_size2){ + type_id = new_type_id1; + size = new_size1; + } + + if(offset1 == 0 && offset2 == 0){ + if(!add_heap_area_pair(previous, block1, frag1, block2, frag2)){ + if(match_pairs){ + match_equals(previous); + xbt_dynar_free(&previous); + } + return 0; + } + } if(size <= 0){ if(match_pairs){ @@ -1105,15 +1276,21 @@ int compare_heap_area(void *area1, void* area2, xbt_dynar_t previous, xbt_dict_t /* Start comparison*/ if(type_id != NULL){ - res_compare = compare_heap_area_with_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, type_id, size, check_ignore, pointer_level); - if(res_compare != 0){ + if(switch_type) + res_compare = compare_heap_area_with_type(area1, area2, area1_to_compare, area2_to_compare, previous, other_types, all_types, type_id, size, check_ignore, pointer_level); + else + res_compare = compare_heap_area_with_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, type_id, size, check_ignore, pointer_level); + if(res_compare == 1){ if(match_pairs) xbt_dynar_free(&previous); return res_compare; } }else{ - res_compare = compare_heap_area_without_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, size, check_ignore); - if(res_compare != 0){ + if(switch_type) + res_compare = compare_heap_area_without_type(area1, area2, area1_to_compare, area2_to_compare, previous, other_types, all_types, size, check_ignore); + else + res_compare = compare_heap_area_without_type(area1, area2, area1_to_compare, area2_to_compare, previous, all_types, other_types, size, check_ignore); + if(res_compare == 1){ if(match_pairs) xbt_dynar_free(&previous); return res_compare; @@ -1165,7 +1342,7 @@ char *get_type_description(xbt_dict_t types, char *type_name){ dw_type_t type; xbt_dict_foreach(types, dict_cursor, type_origin, type){ - if(type->name && (strcmp(type->name, type_name) == 0) && type->size > 0){ + if(type->name && (strcmp(type->name, type_name) == 0) && type->byte_size > 0){ xbt_dict_cursor_free(&dict_cursor); return type_origin; }