X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/40334ce6fe520b2fa7d1e240716e4f34a5fdc74e..cc1eb8c4e293f75ccddc257ebc44bfcd0883073e:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index abeaf9cfd1..06b11417e8 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -15,6 +15,8 @@ #include "mc/mc_private.h" #include "mc/mc_snapshot.h" +using simgrid::mc::remote; + extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt, @@ -146,7 +148,8 @@ struct s_mc_diff { size_t heaplimit; // Number of blocks in the heaps: size_t heapsize1, heapsize2; - xbt_dynar_t to_ignore1, to_ignore2; + std::vector* to_ignore1; + std::vector* to_ignore2; s_heap_area_t *equals_to1, *equals_to2; dw_type_t *types1, *types2; size_t available; @@ -227,25 +230,20 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, return 0; } -static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, +static ssize_t heap_comparison_ignore_size(std::vector* ignore_list, const void *address) { - - unsigned int cursor = 0; int start = 0; - int end = xbt_dynar_length(ignore_list) - 1; - mc_heap_ignore_region_t region; + int end = ignore_list->size() - 1; while (start <= end) { - cursor = (start + end) / 2; - region = - (mc_heap_ignore_region_t) xbt_dynar_get_as(ignore_list, cursor, - mc_heap_ignore_region_t); - if (region->address == address) - return region->size; - if (region->address < address) + unsigned int cursor = (start + end) / 2; + s_mc_heap_ignore_region_t region = (*ignore_list)[cursor]; + if (region.address == address) + return region.size; + if (region.address < address) start = cursor + 1; - if (region->address > address) + if (region.address > address) end = cursor - 1; } @@ -345,8 +343,11 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, return 0; } -int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, - xbt_dynar_t i2) +} + +int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, + std::vector* i1, + std::vector* i2) { if (mc_diff_info == NULL) { mc_diff_info = xbt_new0(struct s_mc_diff, 1); @@ -366,7 +367,7 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process()); + state->std_heap_copy = *mc_model_checker->process().get_heap(); state->heapsize1 = heap1->heapsize; state->heapsize2 = heap2->heapsize; @@ -407,6 +408,8 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, } +extern "C" { + void reset_heap_information() { @@ -416,10 +419,10 @@ void reset_heap_information() static inline mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot) { - size_t n = snapshot->snapshot_regions_count; + size_t n = snapshot->snapshot_regions.size(); 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) + mc_mem_region_t region = snapshot->snapshot_regions[i].get(); + if (region->region_type() == simgrid::mc::RegionType::Heap) return region; } xbt_die("No heap region"); @@ -451,8 +454,10 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; // This is in snapshot do not use them directly: - const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer(snapshot1, heapinfo_address, MC_PROCESS_INDEX_MISSING); - const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer(snapshot2, heapinfo_address, MC_PROCESS_INDEX_MISSING); + const malloc_info* heapinfos1 = snapshot1->read( + (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); + const malloc_info* heapinfos2 = snapshot2->read( + (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); while (i1 <= state->heaplimit) { @@ -502,7 +507,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (char *) state->std_heap_copy.heapbase; res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -541,7 +546,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -593,7 +598,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j1 << heapinfo2->type)); res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) @@ -641,7 +646,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j2 << heapinfo2b->type)); res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot2, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -816,13 +821,13 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i 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(snapshot1, (char *) real_area1 + pointer_align, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char *) real_area2 + pointer_align, process_index); + addr_pointed1 = snapshot1->read( + remote((void**)((char *) real_area1 + pointer_align)), process_index); + addr_pointed2 = snapshot2->read( + remote((void**)((char *) real_area2 + pointer_align)), process_index); - 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) { + if (process->in_maestro_stack(remote(addr_pointed1)) + && process->in_maestro_stack(remote(addr_pointed2))) { i = pointer_align + sizeof(void *); continue; } else if (addr_pointed1 > state->std_heap_copy.heapbase @@ -976,15 +981,19 @@ 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(snapshot1, real_area1, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index); + addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); + addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); return (addr_pointed1 != addr_pointed2);; } else { pointer_level++; if (pointer_level > 1) { /* Array of pointers */ for (size_t i = 0; i < (area_size / sizeof(void *)); i++) { - 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); + addr_pointed1 = snapshot1->read( + remote((void**)((char*) real_area1 + i * sizeof(void *))), + process_index); + addr_pointed2 = snapshot2->read( + remote((void**)((char*) real_area2 + i * sizeof(void *))), + process_index); if (addr_pointed1 > state->std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && addr_pointed2 > state->std_heap_copy.heapbase @@ -999,8 +1008,8 @@ top: return res; } } else { - addr_pointed1 = MC_snapshot_read_pointer(snapshot1, real_area1, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index); + addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); + addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); if (addr_pointed1 > state->std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && addr_pointed2 > state->std_heap_copy.heapbase @@ -1106,7 +1115,7 @@ static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, } else { void *real_member = mc_member_resolve(real_base_address, type, member, - (mc_address_space_t) snapshot, process_index); + snapshot, process_index); if ((char*) real_member - (char *) real_base_address == offset) return member->subtype; } @@ -1157,10 +1166,10 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // This is the address of std_heap->heapinfo in the application process: void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; - const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer( - snapshot1, heapinfo_address, process_index); - const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer( - snapshot2, heapinfo_address, process_index); + const malloc_info* heapinfos1 = snapshot1->read( + remote((const malloc_info**)heapinfo_address), process_index); + const malloc_info* heapinfos2 = snapshot2->read( + remote((const malloc_info**)heapinfo_address), process_index); malloc_info heapinfo_temp1, heapinfo_temp2; @@ -1608,7 +1617,7 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) /* Heap information */ state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process()); + state->std_heap_copy = *mc_model_checker->process().get_heap(); state->heapbase1 = (char *) heap1 + BLOCKSIZE; state->heapbase2 = (char *) heap2 + BLOCKSIZE;