X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/218c42a20c7eaba87e20cfb3eaac5ad8e0d0f739..6a20b94eaec32fb5224c18d21e141bef70da15d8:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index 7b7ecb7f56..f8bbd845b1 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1,21 +1,21 @@ -/* mc_diff - Memory snapshooting and comparison */ - /* Copyright (c) 2008-2015. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ -#include "xbt/ex_interface.h" /* internals of backtrace setup */ +/* mc_diff - Memory snapshooting and comparison */ + +#include "src/xbt/ex_interface.h" /* internals of backtrace setup */ #include "xbt/str.h" #include "mc/mc.h" #include "xbt/mmalloc.h" -#include "mc_object_info.h" +#include "src/mc/mc_object_info.h" #include "mc/datatypes.h" -#include "mc/mc_private.h" -#include "mc/mc_snapshot.h" -#include "mc/mc_dwarf.hpp" -#include "mc/Type.hpp" +#include "src/mc/mc_private.h" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_dwarf.hpp" +#include "src/mc/Type.hpp" using simgrid::mc::remote; @@ -24,9 +24,6 @@ extern "C" { 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; - /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ @@ -37,8 +34,8 @@ struct XBT_PRIVATE s_mc_diff { std::size_t heaplimit; // Number of blocks in the heaps: std::size_t heapsize1, heapsize2; - std::vector* to_ignore1; - std::vector* to_ignore2; + std::vector* to_ignore1; + std::vector* to_ignore2; s_heap_area_t *equals_to1, *equals_to2; simgrid::mc::Type **types1; simgrid::mc::Type **types2; @@ -50,7 +47,7 @@ struct XBT_PRIVATE s_mc_diff { #define types1_(i,j) types1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] #define types2_(i,j) types2[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] -__thread struct s_mc_diff *mc_diff_info = NULL; +static __thread struct s_mc_diff *mc_diff_info = nullptr; /*********************************** Free functions ************************************/ @@ -120,15 +117,16 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, return 0; } -static ssize_t heap_comparison_ignore_size(std::vector* ignore_list, - const void *address) +static ssize_t heap_comparison_ignore_size( + std::vector* ignore_list, + const void *address) { int start = 0; int end = ignore_list->size() - 1; while (start <= end) { unsigned int cursor = (start + end) / 2; - s_mc_heap_ignore_region_t region = (*ignore_list)[cursor]; + simgrid::mc::IgnoredHeapRegion const& region = (*ignore_list)[cursor]; if (region.address == address) return region.size; if (region.address < address) @@ -140,31 +138,21 @@ static ssize_t heap_comparison_ignore_size(std::vectoraddress) - return 1; - } - - return 0; + for (auto const& stack : mc_model_checker->process().stack_areas()) + if (address == stack.address) + return true; + return false; } // TODO, this should depend on the snapshot? -static int is_block_stack(int block) +static bool is_block_stack(int block) { - unsigned int cursor = 0; - stack_region_t stack; - - xbt_dynar_foreach(stacks_areas, cursor, stack) { - if (block == stack->block) - return 1; - } - - return 0; + for (auto const& stack : mc_model_checker->process().stack_areas()) + if (block == stack.block) + return true; + return false; } static void match_equals(struct s_mc_diff *state, xbt_dynar_t list) @@ -236,8 +224,8 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, } int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2) + std::vector* i1, + std::vector* i2) { if (mc_diff_info == NULL) { mc_diff_info = xbt_new0(struct s_mc_diff, 1); @@ -349,7 +337,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) const malloc_info* heapinfos2 = snapshot2->read( (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); - while (i1 < state->heaplimit) { + while (i1 <= state->heaplimit) { const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)); const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info)); @@ -413,7 +401,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } - while (i2 < state->heaplimit && !equal) { + while (i2 <= state->heaplimit && !equal) { addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char *) state->std_heap_copy.heapbase; @@ -498,7 +486,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } - while (i2 < state->heaplimit && !equal) { + while (i2 <= state->heaplimit && !equal) { const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read( heap_region2, &heapinfo_temp2b, &heapinfos2[i2], @@ -572,7 +560,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) /* All blocks/fragments are equal to another block/fragment ? */ size_t i = 1, j = 0; - for(i = 1; i < state->heaplimit; i++) { + for(i = 1; i <= state->heaplimit; i++) { const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read( heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { @@ -614,7 +602,7 @@ 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 heap1 : %d", nb_diff1); - for (i=1; i < state->heaplimit; i++) { + for (i=1; i <= state->heaplimit; i++) { const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read( heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { @@ -770,9 +758,13 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, int process_inde int pointer_level) { top: - if (is_stack(real_area1) && is_stack(real_area2)) + // HACK: This should not happen but in pratice, there is some + // DW_TAG_typedef without DW_AT_type. We should fix this somehow. + if (type == nullptr) return 0; + if (is_stack(real_area1) && is_stack(real_area2)) + return 0; ssize_t ignore1, ignore2; if ((check_ignore > 0) @@ -937,7 +929,7 @@ top: void *real_member2 = simgrid::dwarf::resolve_member( real_area2, type, &member, (simgrid::mc::AddressSpace*) snapshot2, process_index); res = - compare_heap_area_with_type(state, process_index, real_member1, real_member2, + compare_heap_area_with_type(state, process_index, real_member1, real_member2, snapshot1, snapshot2, previous, member.type, -1, check_ignore, 0);