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;
}
-
+// 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){
else
return (memcmp(area1, area2, area_size) != 0);
}else{
- if(area_size != -1 && type->size != area_size)
+ 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_enumeration_type:
- if(area_size != -1 && type->size != area_size)
+ 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:
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 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 */
+ 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);
switch_types = 1;
}
}
- elm_size = subtype->size;
+ elm_size = subtype->byte_size;
break;
+ // TODO, just remove the type indirection?
case e_dw_typedef:
case e_dw_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);
switch_types = 1;
}
}
- elm_size = subsubtype->size;
+ elm_size = subsubtype->byte_size;
break;
default :
return 0;
break;
}
- for(i=0; i<type->size; i++){
+ for(i=0; i<type->element_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_structure_type:
- if(type->size == 0){ /*declaration of the structure, need the complete description */
+ 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);
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;
}
}
break;
case e_dw_union_type:
- return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->size, check_ignore);
+ return compare_heap_area_without_type(real_area1, real_area2, area1, area2, previous, all_types, other_types, type->byte_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);
}
-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(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 = 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)
+ 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;
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_id){
type = xbt_dict_get_or_null(all_types, type_id);
- if(type->size == 0){
+ if(type->byte_size == 0){
if(type->dw_type_id == NULL){
type_desc = get_type_description(all_types, type->name);
if(type_desc)
if((type->type == e_dw_pointer_type) || ((type->type == e_dw_base_type) && (!strcmp(type->name, "char"))))
type_size = -1;
else
- type_size = type->size;
+ type_size = type->byte_size;
}
if((heapinfo1[block1].type == -1) && (heapinfo2[block2].type == -1)){ /* Free block */
}
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->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;
}
}
/* 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);
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;
}
