X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/41ac2593deb812baee12c58b6b7c4911a2da8cd7..5a99bd94a2cedf8b455e78de53b19bebab8c034e:/src/mc/mc_diff.c diff --git a/src/mc/mc_diff.c b/src/mc/mc_diff.c index dbef02a6f8..03dfb36aba 100644 --- a/src/mc/mc_diff.c +++ b/src/mc/mc_diff.c @@ -10,8 +10,10 @@ #include "xbt/str.h" #include "mc/mc.h" #include "xbt/mmalloc.h" +#include "mc_object_info.h" #include "mc/datatypes.h" #include "mc/mc_private.h" +#include "mc/mc_snapshot.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt, "Logging specific to mc_diff in mc"); @@ -90,7 +92,8 @@ static void mmalloc_backtrace_display(void *addr) /* type = heap->heapinfo[block].type; */ /* switch(type){ */ - /* case -1 : /\* Free block *\/ */ + /* case MMALLOC_TYPE_HEAPINFO : */ + /* case MMALLOC_TYPE_FREE : /\* Free block *\/ */ /* fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n"); */ /* xbt_abort(); */ /* break; */ @@ -422,9 +425,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; int nb_diff1 = 0, nb_diff2 = 0; - xbt_dynar_t previous = - xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); - int equal, res_compare = 0; /* Check busy blocks */ @@ -438,25 +438,29 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) mc_mem_region_t heap_region2 = snapshot2->regions[0]; // This is in snapshot do not use them directly: - malloc_info* heapinfos1 = mc_snapshot_read_pointer(&((xbt_mheap_t)std_heap)->heapinfo, snapshot1); - malloc_info* heapinfos2 = mc_snapshot_read_pointer(&((xbt_mheap_t)std_heap)->heapinfo, snapshot2); + malloc_info* heapinfos1 = mc_snapshot_read_pointer(&std_heap->heapinfo, snapshot1, MC_NO_PROCESS_INDEX); + malloc_info* heapinfos2 = mc_snapshot_read_pointer(&std_heap->heapinfo, snapshot2, MC_NO_PROCESS_INDEX); while (i1 <= state->heaplimit) { - // TODO, lookup in the correct region in order to speed it up: malloc_info* heapinfo1 = mc_snapshot_read_region(&heapinfos1[i1], heap_region1, &heapinfo_temp1, sizeof(malloc_info)); malloc_info* heapinfo2 = mc_snapshot_read_region(&heapinfos2[i1], heap_region2, &heapinfo_temp2, sizeof(malloc_info)); - if (heapinfo1->type == -1) { /* Free block */ - i1++; + if (heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ + i1 ++; continue; } + if (heapinfo1->type < 0) { + fprintf(stderr, "Unkown mmalloc block type.\n"); + abort(); + } + addr_block1 = ((void *) (((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); - if (heapinfo1->type == 0) { /* Large block */ + if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ if (is_stack(addr_block1)) { for (k = 0; k < heapinfo1->busy_block.size; k++) @@ -486,7 +490,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); res_compare = - compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(MC_NO_PROCESS_INDEX, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -498,8 +502,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) i1 += heapinfo1->busy_block.size; } - xbt_dynar_reset(previous); - } } @@ -517,7 +519,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) malloc_info* heapinfo2b = mc_snapshot_read_region(&heapinfos2[i2], heap_region2, &heapinfo_temp2b, sizeof(malloc_info)); - if (heapinfo2b->type != 0) { + if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) { i2++; continue; } @@ -528,7 +530,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } res_compare = - compare_heap_area(addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(MC_NO_PROCESS_INDEX, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -540,8 +542,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) i1 += heapinfo1->busy_block.size; } - xbt_dynar_reset(previous); - i2++; } @@ -580,18 +580,15 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); addr_frag2 = (void *) ((char *) addr_block2 + - (j1 << ((xbt_mheap_t) state->s_heap)->heapinfo[i1]. - type)); + (j1 << heapinfo2->type)); res_compare = - compare_heap_area(addr_frag1, addr_frag2, snapshot1, snapshot2, + compare_heap_area(MC_NO_PROCESS_INDEX, addr_frag1, addr_frag2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) equal = 1; - xbt_dynar_reset(previous); - } } @@ -599,11 +596,23 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) while (i2 <= state->heaplimit && !equal) { malloc_info* heapinfo2b = mc_snapshot_read_region(&heapinfos2[i2], heap_region2, &heapinfo_temp2b, sizeof(malloc_info)); - if (heapinfo2b->type <= 0) { + + if (heapinfo2b->type == MMALLOC_TYPE_FREE || heapinfo2b->type == MMALLOC_TYPE_HEAPINFO) { + i2 ++; + continue; + } + + // We currently do not match fragments with unfragmented blocks (maybe we should). + if (heapinfo2b->type == MMALLOC_TYPE_UNFRAGMENTED) { i2++; continue; } + if (heapinfo2b->type < 0) { + fprintf(stderr, "Unkown mmalloc block type.\n"); + abort(); + } + for (j2 = 0; j2 < (size_t) (BLOCKSIZE >> heapinfo2b->type); j2++) { @@ -618,21 +627,17 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (char *) ((xbt_mheap_t) state->s_heap)->heapbase)); addr_frag2 = (void *) ((char *) addr_block2 + - (j2 << ((xbt_mheap_t) state->s_heap)->heapinfo[i2]. - type)); + (j2 << heapinfo2b->type)); res_compare = - compare_heap_area(addr_frag1, addr_frag2, snapshot2, snapshot2, + compare_heap_area(MC_NO_PROCESS_INDEX, addr_frag1, addr_frag2, snapshot2, snapshot2, NULL, NULL, 0); if (res_compare != 1) { equal = 1; - xbt_dynar_reset(previous); break; } - xbt_dynar_reset(previous); - } i2++; @@ -663,7 +668,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) for(i = 1; i <= state->heaplimit; i++) { malloc_info* heapinfo1 = mc_snapshot_read_region(&heapinfos1[i], heap_region1, &heapinfo_temp1, sizeof(malloc_info)); - if (heapinfo1->type == 0) { + if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { if (i1 == state->heaplimit) { if (heapinfo1->busy_block.busy_size > 0) { if (state->equals_to1_(i, 0).valid == 0) { @@ -704,7 +709,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) for (i=1; i <= state->heaplimit; i++) { malloc_info* heapinfo2 = mc_snapshot_read_region(&heapinfos2[i], heap_region2, &heapinfo_temp2, sizeof(malloc_info)); - if (heapinfo2->type == 0) { + if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { if (i1 == state->heaplimit) { if (heapinfo2->busy_block.busy_size > 0) { if (state->equals_to2_(i, 0).valid == 0) { @@ -743,7 +748,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) if (i1 == state->heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); - xbt_dynar_free(&previous); return ((nb_diff1 > 0) || (nb_diff2 > 0)); } @@ -758,7 +762,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) * @param size * @param check_ignore */ -static int compare_heap_area_without_type(struct s_mc_diff *state, +static int compare_heap_area_without_type(struct s_mc_diff *state, int process_index, void *real_area1, void *real_area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, @@ -795,11 +799,11 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, } } - if (mc_snapshot_region_memcp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { + if (mc_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { pointer_align = (i / sizeof(void *)) * sizeof(void *); - addr_pointed1 = mc_snapshot_read_pointer((char *) real_area1 + pointer_align, snapshot1); - addr_pointed2 = mc_snapshot_read_pointer((char *) real_area2 + pointer_align, snapshot2); + addr_pointed1 = mc_snapshot_read_pointer((char *) real_area1 + pointer_align, snapshot1, process_index); + addr_pointed2 = mc_snapshot_read_pointer((char *) real_area2 + pointer_align, snapshot2, process_index); if (addr_pointed1 > maestro_stack_start && addr_pointed1 < maestro_stack_end @@ -813,7 +817,7 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) { // Both addreses are in the heap: res_compare = - compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, NULL, 0); if (res_compare == 1) { return res_compare; @@ -848,7 +852,7 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, * @param pointer_level * @return 0 (same), 1 (different), -1 (unknown) */ -static int compare_heap_area_with_type(struct s_mc_diff *state, +static int compare_heap_area_with_type(struct s_mc_diff *state, int process_index, void *real_area1, void *real_area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, @@ -856,7 +860,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, int area_size, int check_ignore, int pointer_level) { - +top: if (is_stack(real_area1) && is_stack(real_area2)) return 0; @@ -888,12 +892,12 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, if (real_area1 == real_area2) return -1; else - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0); } else { if (area_size != -1 && type->byte_size != area_size) return -1; else { - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); } } break; @@ -901,15 +905,14 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, if (area_size != -1 && type->byte_size != area_size) return -1; else - return (mc_snapshot_region_memcp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); + return (mc_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); break; case DW_TAG_typedef: case DW_TAG_const_type: case DW_TAG_volatile_type: - return compare_heap_area_with_type(state, real_area1, real_area2, - snapshot1, snapshot2, previous, - type->subtype, area_size, check_ignore, - pointer_level); + // Poor man's TCO: + type = type->subtype; + goto top; break; case DW_TAG_array_type: subtype = type->subtype; @@ -945,7 +948,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, for (i = 0; i < type->element_count; i++) { // TODO, add support for variable stride (DW_AT_byte_stride) res = - compare_heap_area_with_type(state, + compare_heap_area_with_type(state, process_index, (char *) real_area1 + (i * elm_size), (char *) real_area2 + (i * elm_size), snapshot1, snapshot2, previous, @@ -959,21 +962,21 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, case DW_TAG_rvalue_reference_type: case DW_TAG_pointer_type: if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { - addr_pointed1 = mc_snapshot_read_pointer(real_area1, snapshot1); - addr_pointed2 = mc_snapshot_read_pointer(real_area2, snapshot2); + addr_pointed1 = mc_snapshot_read_pointer(real_area1, snapshot1, process_index); + addr_pointed2 = mc_snapshot_read_pointer(real_area2, snapshot2, process_index); return (addr_pointed1 != addr_pointed2);; } else { pointer_level++; if (pointer_level > 1) { /* Array of pointers */ for (i = 0; i < (area_size / sizeof(void *)); i++) { - addr_pointed1 = mc_snapshot_read_pointer((char*) real_area1 + i * sizeof(void *), snapshot1); - addr_pointed2 = mc_snapshot_read_pointer((char*) real_area2 + i * sizeof(void *), snapshot2); + addr_pointed1 = mc_snapshot_read_pointer((char*) real_area1 + i * sizeof(void *), snapshot1, process_index); + addr_pointed2 = mc_snapshot_read_pointer((char*) real_area2 + i * sizeof(void *), snapshot2, process_index); if (addr_pointed1 > state->s_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && addr_pointed2 > state->s_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) res = - compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, pointer_level); else @@ -982,13 +985,13 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, return res; } } else { - addr_pointed1 = mc_snapshot_read_pointer(real_area1, snapshot1); - addr_pointed2 = mc_snapshot_read_pointer(real_area2, snapshot2); + addr_pointed1 = mc_snapshot_read_pointer(real_area1, snapshot1, process_index); + addr_pointed2 = mc_snapshot_read_pointer(real_area2, snapshot2, process_index); if (addr_pointed1 > state->s_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && addr_pointed2 > state->s_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + return compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, pointer_level); else @@ -1004,7 +1007,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, if (area_size > type->byte_size && area_size % type->byte_size == 0) { for (i = 0; i < (area_size / type->byte_size); i++) { res = - compare_heap_area_with_type(state, + compare_heap_area_with_type(state, process_index, (char *) real_area1 + i * type->byte_size, (char *) real_area2 + i * type->byte_size, snapshot1, snapshot2, previous, type, -1, @@ -1020,11 +1023,11 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, xbt_dynar_foreach(type->members, cursor, member) { // TODO, optimize this? (for the offset case) char *real_member1 = - mc_member_resolve(real_area1, type, member, snapshot1); + mc_member_resolve(real_area1, type, member, snapshot1, process_index); char *real_member2 = - mc_member_resolve(real_area2, type, member, snapshot2); + mc_member_resolve(real_area2, type, member, snapshot2, process_index); res = - compare_heap_area_with_type(state, real_member1, real_member2, + compare_heap_area_with_type(state, process_index, real_member1, real_member2, snapshot1, snapshot2, previous, member->subtype, -1, check_ignore, 0); @@ -1035,7 +1038,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, } break; case DW_TAG_union_type: - return compare_heap_area_without_type(state, real_area1, real_area2, + return compare_heap_area_without_type(state, process_index, real_area1, real_area2, snapshot1, snapshot2, previous, type->byte_size, check_ignore); break; @@ -1059,7 +1062,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, */ static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, int offset, int area_size, - mc_snapshot_t snapshot) + mc_snapshot_t snapshot, int process_index) { // Beginning of the block, the infered variable type if the type of the block: @@ -1088,7 +1091,7 @@ static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, return member->subtype; } else { char *real_member = - mc_member_resolve(real_base_address, type, member, snapshot); + mc_member_resolve(real_base_address, type, member, snapshot, process_index); if (real_member - (char *) real_base_address == offset) return member->subtype; } @@ -1115,7 +1118,7 @@ static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, * @param pointer_level * @return 0 (same), 1 (different), -1 */ -int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, +int compare_heap_area(int process_index, void *area1, void *area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, dw_type_t type, int pointer_level) { @@ -1128,7 +1131,6 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, int check_ignore = 0; void *real_addr_block1, *real_addr_block2, *real_addr_frag1, *real_addr_frag2; - int type_size = -1; int offset1 = 0, offset2 = 0; int new_size1 = -1, new_size2 = -1; @@ -1136,8 +1138,8 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, int match_pairs = 0; - malloc_info* heapinfos1 = mc_snapshot_read_pointer(&((xbt_mheap_t)std_heap)->heapinfo, snapshot1); - malloc_info* heapinfos2 = mc_snapshot_read_pointer(&((xbt_mheap_t)std_heap)->heapinfo, snapshot2); + malloc_info* heapinfos1 = mc_snapshot_read_pointer(&std_heap->heapinfo, snapshot1, process_index); + malloc_info* heapinfos2 = mc_snapshot_read_pointer(&std_heap->heapinfo, snapshot2, process_index); malloc_info heapinfo_temp1, heapinfo_temp2; @@ -1207,18 +1209,25 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, malloc_info* heapinfo1 = mc_snapshot_read_region(&heapinfos1[block1], heap_region1, &heapinfo_temp1, sizeof(malloc_info)); malloc_info* heapinfo2 = mc_snapshot_read_region(&heapinfos2[block2], heap_region2, &heapinfo_temp2, sizeof(malloc_info)); - if ((heapinfo1->type == -1) && (heapinfo2->type == -1)) { /* Free block */ + if ((heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type==MMALLOC_TYPE_HEAPINFO) + && (heapinfo2->type == MMALLOC_TYPE_FREE || heapinfo2->type ==MMALLOC_TYPE_HEAPINFO)) { + /* Free block */ if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); } return 0; - } else if ((heapinfo1->type == 0) && (heapinfo2->type == 0)) { /* Complete block */ + } else if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED + && heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { + /* Complete block */ // TODO, lookup variable type from block type as done for fragmented blocks + offset1 = (char *) area1 - (char *) real_addr_block1; + offset2 = (char *) area2 - (char *) real_addr_block2; + if (state->equals_to1_(block1, 0).valid && state->equals_to2_(block2, 0).valid) { if (equal_blocks(state, block1, block2)) { @@ -1233,7 +1242,7 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, if (type_size != -1) { if (type_size != heapinfo1->busy_block.busy_size && type_size != heapinfo2->busy_block.busy_size - && type->name != NULL && !strcmp(type->name, "s_smx_context")) { + && (type->name == NULL || !strcmp(type->name, "struct s_smx_context"))) { if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); @@ -1304,12 +1313,10 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, // Process address of the fragment: real_addr_frag1 = (void *) ((char *) real_addr_block1 + - (frag1 << ((xbt_mheap_t) state->s_heap)->heapinfo[block1]. - type)); + (frag1 << heapinfo1->type)); real_addr_frag2 = (void *) ((char *) real_addr_block2 + - (frag2 << ((xbt_mheap_t) state->s_heap)->heapinfo[block2]. - type)); + (frag2 << heapinfo2->type)); // Check the size of the fragments against the size of the type: if (type_size != -1) { @@ -1321,6 +1328,7 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, } return -1; } + // ? if (type_size != heapinfo1->busy_frag.frag_size[frag1] || type_size != heapinfo2->busy_frag.frag_size[frag2]) { if (match_pairs) { @@ -1330,10 +1338,11 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, return -1; } } + // Check if the blocks are already matched together: if (state->equals_to1_(block1, frag1).valid && state->equals_to2_(block2, frag2).valid) { - if (equal_fragments(state, block1, frag1, block2, frag2)) { + if (offset1==offset2 && equal_fragments(state, block1, frag1, block2, frag2)) { if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); @@ -1357,11 +1366,12 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, return 1; } } + // Size of the fragment: size = heapinfo1->busy_frag.frag_size[frag1]; // Remember (basic) type inference. - // The current data structure only allows us to do this for the whole block. + // The current data structure only allows us to do this for the whole fragment. if (type != NULL && area1 == real_addr_frag1) { state->types1_(block1, frag1) = type; } @@ -1384,24 +1394,24 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, && state->types2_(block2, frag2) != NULL) { new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1, frag1), - offset1, size, snapshot1); + offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2, frag2), - offset1, size, snapshot2); + offset1, size, snapshot2, process_index); } else if (state->types1_(block1, frag1) != NULL) { new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1, frag1), - offset1, size, snapshot1); + offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types1_(block1, frag1), - offset2, size, snapshot2); + offset2, size, snapshot2, process_index); } else if (state->types2_(block2, frag2) != NULL) { new_type1 = get_offset_type(real_addr_frag1, state->types2_(block2, frag2), - offset1, size, snapshot1); + offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2, frag2), - offset2, size, snapshot2); + offset2, size, snapshot2, process_index); } else { if (match_pairs) { match_equals(state, previous); @@ -1472,12 +1482,12 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, /* Start comparison */ if (type) { res_compare = - compare_heap_area_with_type(state, area1, area2, snapshot1, snapshot2, + compare_heap_area_with_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, type, size, check_ignore, pointer_level); } else { res_compare = - compare_heap_area_without_type(state, area1, area2, snapshot1, snapshot2, + compare_heap_area_without_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, size, check_ignore); } if (res_compare == 1) { @@ -1522,9 +1532,9 @@ static int get_pointed_area_size(void *area, int heap) || (block > state->heapsize1) || (block < 1)) return -1; - if (heapinfo[block].type == -1) { /* Free block */ + if (heapinfo[block].type == MMALLOC_TYPE_FREE || heapinfo[block].type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ return -1; - } else if (heapinfo[block].type == 0) { /* Complete block */ + } else if (heapinfo[block].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Complete block */ return (int) heapinfo[block].busy_block.busy_size; } else { frag = @@ -1625,12 +1635,13 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) } else { - if (state->heapinfo1[i].type == -1) { /* Free block */ + if (state->heapinfo1[i].type == MMALLOC_TYPE_FREE + || state->heapinfo1[i].type == MMALLOC_TYPE_HAPINFO) { /* Free block */ i++; continue; } - if (state->heapinfo1[i].type == 0) { /* Large block */ + if (state->heapinfo1[i].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ if (state->heapinfo1[i].busy_block.size != state->heapinfo2[i].busy_block.size) {