to_ignore2 = i2;
equals_to1 = malloc(heaplimit * sizeof(heap_area_t *));
- for(i=0; i<=heaplimit; i++){
- equals_to1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
- for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++)
- equals_to1[i][j] = NULL;
- }
-
- equals_to2 = malloc(heaplimit * sizeof(heap_area_t *));
- for(i=0; i<=heaplimit; i++){
- equals_to2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
- for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++)
- equals_to2[i][j] = NULL;
- }
-
types1 = malloc(heaplimit * sizeof(type_name *));
for(i=0; i<=heaplimit; i++){
+ equals_to1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
types1[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(type_name));
- for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++)
+ for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++){
+ equals_to1[i][j] = NULL;
types1[i][j] = NULL;
+ }
}
+ equals_to2 = malloc(heaplimit * sizeof(heap_area_t *));
types2 = malloc(heaplimit * sizeof(type_name *));
for(i=0; i<=heaplimit; i++){
+ equals_to2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(heap_area_t));
types2[i] = malloc(MAX_FRAGMENT_PER_BLOCK * sizeof(type_name));
- for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++)
+ for(j=0; j<MAX_FRAGMENT_PER_BLOCK; j++){
+ equals_to2[i][j] = NULL;
types2[i][j] = NULL;
+ }
}
if(MC_is_active()){
size_t i = 0, j;
- for(i=0; i<heaplimit; i++){
+ for(i=0; i<=heaplimit; i++){
for(j=0; j<MAX_FRAGMENT_PER_BLOCK;j++){
heap_area_free(equals_to1[i][j]);
equals_to1[i][j] = NULL;
}
-int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2){
+int mmalloc_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dict_t all_types, xbt_dict_t other_types){
if(heap1 == NULL && heap2 == NULL){
XBT_DEBUG("Malloc descriptors null");
addr_block2 = ((void*) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)((xbt_mheap_t)s_heap)->heapbase));
- 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 != 1){
for(k=1; k < heapinfo2[i1].busy_block.size; k++)
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 != 1 ){
for(k=1; k < heapinfo2[i2].busy_block.size; k++)
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 != 1)
equal = 1;
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 != 1){
equal = 1;
}
-static char* get_offset_type(char* type_id, int offset, xbt_dict_t all_types, xbt_dict_t other_types, int area_size){
+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 e_dw_structure_type :
if(type->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);
+ 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 = xbt_dict_get_or_null(other_types, get_type_description(other_types, type->name));
+ 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->size != area_size){
if(area_size>type->size && area_size%type->size == 0)
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;
}
if(type_size != -1){
- if(type_size != heapinfo1[block1].busy_block.busy_size && type_size != heapinfo2[block2].busy_block.busy_size && !strcmp(type->name, "s_smx_context"))
+ if(type_size != heapinfo1[block1].busy_block.busy_size && type_size != heapinfo2[block2].busy_block.busy_size && !strcmp(type->name, "s_smx_context")){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
return -1;
+ }
}
if(heapinfo1[block1].busy_block.size != heapinfo2[block2].busy_block.size){
size = heapinfo1[block1].busy_block.busy_size;
if(type_id != NULL){
- free(types1[block1][0]);
- free(types2[block2][0]);
+ xbt_free(types1[block1][0]);
+ xbt_free(types2[block2][0]);
types1[block1][0] = strdup(type_id);
types2[block2][0] = strdup(type_id);
}
addr_frag2 = (void*) ((char *)addr_block2 + (frag2 << heapinfo2[block2].type));
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[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(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 != heapinfo1[block1].busy_frag.frag_size[frag1] || type_size != heapinfo2[block2].busy_frag.frag_size[frag2])
+ }
+ 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;
+ }
}
if(equals_to1[block1][frag1] != NULL && equals_to2[block2][frag2] != NULL){
if(heapinfo1[block1].busy_frag.frag_size[frag1] != heapinfo2[block2].busy_frag.frag_size[frag2]){
if(type_size == -1){
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
return -1;
}else{
if(match_pairs){
size = heapinfo1[block1].busy_frag.frag_size[frag1];
if(type_id != NULL){
- free(types1[block1][frag1]);
- free(types2[block2][frag2]);
+ xbt_free(types1[block1][frag1]);
+ xbt_free(types2[block2][frag2]);
types1[block1][frag1] = strdup(type_id);
types2[block2][frag2] = strdup(type_id);
}
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);
- new_type_id2 = get_offset_type(types2[block2][frag2], offset1, all_types, other_types, size);
+ 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);
- new_type_id2 = get_offset_type(types1[block1][frag1], offset2, all_types, other_types, size);
+ 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);
- new_type_id2 = get_offset_type(types2[block2][frag2], offset2, all_types, other_types, size);
+ 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)){
- type = xbt_dict_get_or_null(all_types, new_type_id1);
- while(type->size == 0 && type->dw_type_id != NULL)
- type = xbt_dict_get_or_null(all_types, type->dw_type_id);
- new_size1 = type->size;
- type = xbt_dict_get_or_null(all_types, new_type_id2);
- while(type->size == 0 && type->dw_type_id != NULL)
- type = xbt_dict_get_or_null(all_types, type->dw_type_id);
- new_size2 = type->size;
+ if(switch_type){
+ type = xbt_dict_get_or_null(other_types, new_type_id1);
+ while(type->size == 0 && type->dw_type_id != NULL)
+ type = xbt_dict_get_or_null(other_types, type->dw_type_id);
+ new_size1 = type->size;
+ type = xbt_dict_get_or_null(other_types, new_type_id2);
+ while(type->size == 0 && type->dw_type_id != NULL)
+ type = xbt_dict_get_or_null(other_types, type->dw_type_id);
+ new_size2 = type->size;
+ }else{
+ type = xbt_dict_get_or_null(all_types, new_type_id1);
+ while(type->size == 0 && type->dw_type_id != NULL)
+ type = xbt_dict_get_or_null(all_types, type->dw_type_id);
+ new_size1 = type->size;
+ type = xbt_dict_get_or_null(all_types, new_type_id2);
+ while(type->size == 0 && type->dw_type_id != NULL)
+ type = xbt_dict_get_or_null(all_types, type->dw_type_id);
+ new_size2 = type->size;
+ }
}else{
+ if(match_pairs){
+ match_equals(previous);
+ xbt_dynar_free(&previous);
+ }
return -1;
}
}
/* 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(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(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);