X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c963b933d965f120a796d5cd53b84bb68273a3b5..41626f8a47c96f54fa3b1ee61a90fb0af699dcbc:/src/mc/mc_diff.c diff --git a/src/mc/mc_diff.c b/src/mc/mc_diff.c index 20b0e0c597..257481c2a2 100644 --- a/src/mc/mc_diff.c +++ b/src/mc/mc_diff.c @@ -10,15 +10,17 @@ #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"); xbt_dynar_t mc_heap_comparison_ignore; xbt_dynar_t stacks_areas; -void *maestro_stack_start, *maestro_stack_end; + /********************************* Backtrace ***********************************/ @@ -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; */ @@ -226,7 +229,7 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, } static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, - void *address) + const void *address) { unsigned int cursor = 0; @@ -250,7 +253,7 @@ static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, return -1; } -static int is_stack(void *address) +static int is_stack(const void *address) { unsigned int cursor = 0; stack_region_t stack; @@ -412,9 +415,22 @@ void reset_heap_information() } -int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) +// TODO, have a robust way to find it in O(1) +static inline +mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot) { + size_t n = snapshot->snapshot_regions_count; + for (size_t i=0; i!=n; ++i) { + mc_mem_region_t region = snapshot->snapshot_regions[i]; + if (region->region_type == MC_REGION_TYPE_HEAP) + return region; + } + xbt_die("No heap region"); +} +int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) +{ + mc_process_t process = &mc_model_checker->process; struct s_mc_diff *state = mc_diff_info; /* Start comparison */ @@ -422,9 +438,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 */ @@ -434,29 +447,36 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) malloc_info heapinfo_temp1, heapinfo_temp2; malloc_info heapinfo_temp2b; - mc_mem_region_t heap_region1 = snapshot1->regions[0]; - mc_mem_region_t heap_region2 = snapshot2->regions[0]; + mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); + mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); + + // This is the address of std_heap->heapinfo in the application process: + void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; // 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); + const malloc_info* heapinfos1 = MC_snapshot_read_pointer(snapshot1, heapinfo_address, MC_PROCESS_INDEX_MISSING); + const malloc_info* heapinfos2 = MC_snapshot_read_pointer(snapshot2, heapinfo_address, MC_PROCESS_INDEX_MISSING); 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)); + const malloc_info* heapinfo1 = MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)); + const malloc_info* heapinfo2 = MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[i1], 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 +506,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_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -498,8 +518,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) i1 += heapinfo1->busy_block.size; } - xbt_dynar_reset(previous); - } } @@ -515,9 +533,9 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) continue; } - malloc_info* heapinfo2b = mc_snapshot_read_region(&heapinfos2[i2], heap_region2, &heapinfo_temp2b, sizeof(malloc_info)); + const malloc_info* heapinfo2b = MC_region_read(heap_region2, &heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); - if (heapinfo2b->type != 0) { + if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) { i2++; continue; } @@ -528,7 +546,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_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -540,8 +558,6 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) i1 += heapinfo1->busy_block.size; } - xbt_dynar_reset(previous); - i2++; } @@ -583,26 +599,36 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j1 << heapinfo2->type)); res_compare = - compare_heap_area(addr_frag1, addr_frag2, snapshot1, snapshot2, + compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) equal = 1; - xbt_dynar_reset(previous); - } } 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) { + const malloc_info* heapinfo2b = MC_region_read(heap_region2, &heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); + + 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++) { @@ -620,17 +646,14 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j2 << heapinfo2b->type)); res_compare = - compare_heap_area(addr_frag1, addr_frag2, snapshot2, snapshot2, + compare_heap_area(MC_PROCESS_INDEX_MISSING, 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++; @@ -660,8 +683,8 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) size_t i = 1, j = 0; 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) { + const malloc_info* heapinfo1 = MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); + 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) { @@ -701,8 +724,8 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); 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) { + const malloc_info* heapinfo2 = MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); + 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) { @@ -741,7 +764,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)); } @@ -756,21 +778,22 @@ 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, - void *real_area1, void *real_area2, +static int compare_heap_area_without_type(struct s_mc_diff *state, int process_index, + const void *real_area1, const void *real_area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, int size, int check_ignore) { + mc_process_t process = &mc_model_checker->process; int i = 0; - void *addr_pointed1, *addr_pointed2; + const void *addr_pointed1, *addr_pointed2; int pointer_align, res_compare; ssize_t ignore1, ignore2; - mc_mem_region_t heap_region1 = snapshot1->regions[0]; - mc_mem_region_t heap_region2 = snapshot2->regions[0]; + mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); + mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); while (i < size) { @@ -793,16 +816,16 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, } } - if (mc_snapshot_region_memcmp(((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(snapshot1, (char *) real_area1 + pointer_align, process_index); + addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char *) real_area2 + pointer_align, process_index); - if (addr_pointed1 > maestro_stack_start - && addr_pointed1 < maestro_stack_end - && addr_pointed2 > maestro_stack_start - && addr_pointed2 < maestro_stack_end) { + if (addr_pointed1 > process->maestro_stack_start + && addr_pointed1 < process->maestro_stack_end + && addr_pointed2 > process->maestro_stack_start + && addr_pointed2 < process->maestro_stack_end) { i = pointer_align + sizeof(void *); continue; } else if (addr_pointed1 > state->s_heap @@ -811,7 +834,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; @@ -846,8 +869,8 @@ 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, - void *real_area1, void *real_area2, +static int compare_heap_area_with_type(struct s_mc_diff *state, int process_index, + const void *real_area1, const void *real_area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, dw_type_t type, @@ -872,10 +895,10 @@ top: int res, elm_size, i; unsigned int cursor = 0; dw_type_t member; - void *addr_pointed1, *addr_pointed2;; + const void *addr_pointed1, *addr_pointed2;; - mc_mem_region_t heap_region1 = snapshot1->regions[0]; - mc_mem_region_t heap_region2 = snapshot2->regions[0]; + mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); + mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); switch (type->type) { case DW_TAG_unspecified_type: @@ -886,12 +909,12 @@ top: if (real_area1 == real_area2) return -1; else - return (mc_snapshot_region_memcmp(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_memcmp(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; @@ -899,7 +922,7 @@ top: if (area_size != -1 && type->byte_size != area_size) return -1; else - return (mc_snapshot_region_memcmp(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: @@ -942,7 +965,7 @@ top: 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, @@ -956,21 +979,21 @@ top: 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(snapshot1, real_area1, process_index); + addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, 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(snapshot1, (char*) real_area1 + i * sizeof(void *), process_index); + addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char*) real_area2 + i * sizeof(void *), 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 @@ -979,13 +1002,13 @@ top: 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(snapshot1, real_area1, process_index); + addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, 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 @@ -1001,7 +1024,7 @@ top: 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, @@ -1017,11 +1040,11 @@ top: 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, (mc_address_space_t) snapshot1, process_index); char *real_member2 = - mc_member_resolve(real_area2, type, member, snapshot2); + mc_member_resolve(real_area2, type, member, (mc_address_space_t) 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); @@ -1032,7 +1055,7 @@ top: } 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; @@ -1056,7 +1079,7 @@ top: */ 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: @@ -1085,7 +1108,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, (mc_address_space_t) snapshot, process_index); if (real_member - (char *) real_base_address == offset) return member->subtype; } @@ -1112,10 +1135,11 @@ 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, const void *area1, const void *area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, xbt_dynar_t previous, dw_type_t type, int pointer_level) { + mc_process_t process = &mc_model_checker->process; struct s_mc_diff *state = mc_diff_info; @@ -1132,13 +1156,13 @@ 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); + // This is the address of std_heap->heapinfo in the application process: + void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; - malloc_info heapinfo_temp1, heapinfo_temp2; + const malloc_info* heapinfos1 = MC_snapshot_read_pointer(snapshot1, heapinfo_address, process_index); + const malloc_info* heapinfos2 = MC_snapshot_read_pointer(snapshot2, heapinfo_address, process_index); - void* real_area1_to_compare = area1; - void* real_area2_to_compare = area2; + malloc_info heapinfo_temp1, heapinfo_temp2; if (previous == NULL) { previous = @@ -1200,21 +1224,25 @@ int compare_heap_area(void *area1, void *area2, mc_snapshot_t snapshot1, } - mc_mem_region_t heap_region1 = snapshot1->regions[0]; - mc_mem_region_t heap_region2 = snapshot2->regions[0]; + mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); + mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); - 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)); + const malloc_info* heapinfo1 = MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info)); + const malloc_info* heapinfo2 = MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[block2], 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 @@ -1387,24 +1415,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); @@ -1475,12 +1503,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, real_area1_to_compare, real_area2_to_compare, 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, real_area1_to_compare, real_area2_to_compare, snapshot1, snapshot2, + compare_heap_area_without_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, size, check_ignore); } if (res_compare == 1) { @@ -1525,9 +1553,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 = @@ -1628,12 +1656,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) {