X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b20181dac355021101b67ba77ff07f135419e00c..e3cd2ce05b2c30649c7396bbebbf32c7228218fa:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 7393aab83d..4cbb1b891b 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -5,69 +5,21 @@ /** \file compare.cpp Memory snapshooting and comparison */ -#include - -#include -#include -#include -#include -#include - -#include "xbt/dynar.h" -#include "xbt/sysdep.h" -#include - -#include -#include - -#include "src/internal_config.h" - -#include "src/xbt/mmalloc/mmprivate.h" - -#if HAVE_SMPI -#include "src/smpi/include/private.hpp" -#endif - -#include "src/mc/Frame.hpp" -#include "src/mc/ObjectInformation.hpp" -#include "src/mc/Type.hpp" -#include "src/mc/Variable.hpp" #include "src/mc/mc_config.hpp" -#include "src/mc/mc_dwarf.hpp" -#include "src/mc/mc_forward.hpp" #include "src/mc/mc_private.hpp" #include "src/mc/mc_smx.hpp" -#include "src/mc/sosp/mc_snapshot.hpp" +#include "src/mc/sosp/Snapshot.hpp" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); +using simgrid::mc::remote; + namespace simgrid { namespace mc { -struct HeapLocation; -typedef std::array HeapLocationPair; -typedef std::set HeapLocationPairs; -struct HeapArea; -struct ProcessComparisonState; -struct StateComparator; - -static int compare_heap_area( - StateComparator& state, - int process_index, const void *area1, const void* area2, - Snapshot* snapshot1, Snapshot* snapshot2, - HeapLocationPairs* previous, Type* type, int pointer_level); - -} -} - -using simgrid::mc::remote; - /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ -namespace simgrid { -namespace mc { - class HeapLocation { public: int block_ = 0; @@ -86,14 +38,8 @@ public: } }; -static inline -HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2) -{ - return simgrid::mc::HeapLocationPair{{ - simgrid::mc::HeapLocation(block1, fragment1), - simgrid::mc::HeapLocation(block2, fragment2) - }}; -} +typedef std::array HeapLocationPair; +typedef std::set HeapLocationPairs; class HeapArea : public HeapLocation { public: @@ -117,34 +63,14 @@ public: void initHeapInformation(xbt_mheap_t heap, std::vector* i); }; -namespace { - -/** A hash which works with more stuff - * - * It can hash pairs: the standard hash currently doesn't include this. - */ -template class hash : public std::hash { -}; - -template class hash> { -public: - std::size_t operator()(std::pairconst& x) const - { - hash h1; - hash h2; - return h1(x.first) ^ h2(x.second); - } -}; - -} - class StateComparator { public: s_xbt_mheap_t std_heap_copy; std::size_t heaplimit; std::array processStates; - std::unordered_set, hash>> compared_pointers; + std::unordered_set, simgrid::xbt::hash>> + compared_pointers; void clear() { @@ -244,6 +170,12 @@ static ssize_t heap_comparison_ignore_size( return -1; } +static bool is_on_heap(const void* address) +{ + const xbt_mheap_t heap = mc_model_checker->process().get_heap(); + return address >= heap->heapbase && address < heap->breakval; +} + static bool is_stack(const void *address) { for (auto const& stack : mc_model_checker->process().stack_areas()) @@ -301,24 +233,21 @@ int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, } // TODO, have a robust way to find it in O(1) -static inline RegionSnapshot* MC_get_heap_region(Snapshot* snapshot) +static inline Region* MC_get_heap_region(Snapshot* snapshot) { - for (auto const& region : snapshot->snapshot_regions) + for (auto const& region : snapshot->snapshot_regions_) if (region->region_type() == simgrid::mc::RegionType::Heap) return region.get(); xbt_die("No heap region"); } -static -int mmalloc_compare_heap( - simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2) -{ - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); +static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, Snapshot* snapshot1, + Snapshot* snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level); - /* Start comparison */ - int nb_diff1 = 0; - int nb_diff2 = 0; - bool equal; +static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2) +{ + const simgrid::mc::RemoteClient& process = mc_model_checker->process(); /* Check busy blocks */ size_t i1 = 1; @@ -327,22 +256,24 @@ int mmalloc_compare_heap( malloc_info heapinfo_temp2; malloc_info heapinfo_temp2b; - simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1); - simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2); + simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1); + simgrid::mc::Region* 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; + void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->heapinfo; // This is in snapshot do not use them directly: - const malloc_info* heapinfos1 = snapshot1->read( - RemotePtr((std::uint64_t)heapinfo_address), simgrid::mc::ProcessIndexMissing); - const malloc_info* heapinfos2 = snapshot2->read( - RemotePtr((std::uint64_t)heapinfo_address), simgrid::mc::ProcessIndexMissing); + const malloc_info* heapinfos1 = + snapshot1->read(RemotePtr((std::uint64_t)heapinfo_address)); + const malloc_info* heapinfos2 = + snapshot2->read(RemotePtr((std::uint64_t)heapinfo_address)); 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)); + const malloc_info* heapinfo1 = + (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)); + const malloc_info* heapinfo2 = + (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info)); if (heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ i1 ++; @@ -373,14 +304,12 @@ int mmalloc_compare_heap( } size_t i2 = 1; - equal = false; + bool equal = false; /* Try first to associate to same block in the other heap */ if (heapinfo2->type == heapinfo1->type && state.equals_to2_(i1, 0).valid_ == 0) { void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; - int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, - snapshot1, snapshot2, nullptr, nullptr, 0); - if (res_compare != 1) { + if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { for (size_t k = 1; k < heapinfo2->busy_block.size; k++) state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) @@ -399,7 +328,8 @@ int mmalloc_compare_heap( continue; } - const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read(heap_region2, &heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); + const malloc_info* heapinfo2b = + (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) { i2++; @@ -411,10 +341,7 @@ int mmalloc_compare_heap( continue; } - int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, - snapshot1, snapshot2, nullptr, nullptr, 0); - - if (res_compare != 1) { + if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { for (size_t k = 1; k < heapinfo2b->busy_block.size; k++) state.equals_to2_(i2 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) @@ -428,8 +355,7 @@ int mmalloc_compare_heap( if (not equal) { XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, heapinfo1->busy_block.busy_size, addr_block1); - i1 = state.heaplimit + 1; - nb_diff1++; + return true; } } else { /* Fragmented block */ @@ -445,23 +371,20 @@ int mmalloc_compare_heap( void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type)); size_t i2 = 1; - equal = false; + bool equal = false; /* Try first to associate to same fragment_ in the other heap */ if (heapinfo2->type == heapinfo1->type && not state.equals_to2_(i1, j1).valid_) { void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; void* addr_frag2 = (void*)((char*)addr_block2 + (j1 << heapinfo2->type)); - int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, - snapshot1, snapshot2, nullptr, nullptr, 0); - if (res_compare != 1) + if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) equal = true; } while (i2 < state.heaplimit && not equal) { - const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read( - heap_region2, &heapinfo_temp2b, &heapinfos2[i2], - sizeof(malloc_info)); + const malloc_info* heapinfo2b = + (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); if (heapinfo2b->type == MMALLOC_TYPE_FREE || heapinfo2b->type == MMALLOC_TYPE_HEAPINFO) { i2 ++; @@ -490,9 +413,7 @@ int mmalloc_compare_heap( void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; void* addr_frag2 = (void*)((char*)addr_block2 + (j2 << heapinfo2b->type)); - int res_compare = compare_heap_area(state, simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, - snapshot2, snapshot2, nullptr, nullptr, 0); - if (res_compare != 1) { + if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) { equal = true; break; } @@ -504,9 +425,7 @@ int mmalloc_compare_heap( if (not equal) { XBT_DEBUG("Block %zu, fragment_ %zu not found (size_used = %zd, address = %p)\n", i1, j1, heapinfo1->busy_frag.frag_size[j1], addr_frag1); - i1 = state.heaplimit + 1; - nb_diff1++; - break; + return true; } } @@ -516,13 +435,13 @@ int mmalloc_compare_heap( /* All blocks/fragments are equal to another block/fragment_ ? */ for (size_t 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)); + const malloc_info* heapinfo1 = + (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo1->busy_block.busy_size > 0 && not state.equals_to1_(i, 0).valid_) { XBT_DEBUG("Block %zu not found (size used = %zu)", i, heapinfo1->busy_block.busy_size); - nb_diff1++; + return true; } if (heapinfo1->type <= 0) @@ -530,21 +449,18 @@ int mmalloc_compare_heap( for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo1->type); j++) if (i1 == state.heaplimit && heapinfo1->busy_frag.frag_size[j] > 0 && not state.equals_to1_(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo1->busy_frag.frag_size[j]); - nb_diff1++; + return true; } } - if (i1 == state.heaplimit) - XBT_DEBUG("Number of blocks/fragments not found in heap1: %d", nb_diff1); - for (size_t 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)); + const malloc_info* heapinfo2 = + (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED && i1 == state.heaplimit && heapinfo2->busy_block.busy_size > 0 && not state.equals_to2_(i, 0).valid_) { XBT_DEBUG("Block %zu not found (size used = %zu)", i, heapinfo2->busy_block.busy_size); - nb_diff2++; + return true; } if (heapinfo2->type <= 0) @@ -554,15 +470,11 @@ int mmalloc_compare_heap( if (i1 == state.heaplimit && heapinfo2->busy_frag.frag_size[j] > 0 && not state.equals_to2_(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo2->busy_frag.frag_size[j]); - nb_diff2++; + return true; } - } - if (i1 == state.heaplimit) - XBT_DEBUG("Number of blocks/fragments not found in heap2: %d", nb_diff2); - - return nb_diff1 > 0 || nb_diff2 > 0; + return false; } /** @@ -575,31 +487,27 @@ int mmalloc_compare_heap( * @param previous * @param size * @param check_ignore + * @return true when different, false otherwise (same or unknown) */ -static int compare_heap_area_without_type( - simgrid::mc::StateComparator& state, int process_index, - const void *real_area1, const void *real_area2, - simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, - HeapLocationPairs* previous, int size, - int check_ignore) +static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1, + const void* real_area2, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, int size, + int check_ignore) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); - simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1); - simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2); + const simgrid::mc::RemoteClient& process = mc_model_checker->process(); + simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1); + simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2); for (int i = 0; i < size; ) { if (check_ignore > 0) { - ssize_t ignore1 = heap_comparison_ignore_size( - state.processStates[0].to_ignore, (char *) real_area1 + i); + ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, (const char*)real_area1 + i); if (ignore1 != -1) { - ssize_t ignore2 = heap_comparison_ignore_size( - state.processStates[1].to_ignore, (char *) real_area2 + i); + ssize_t ignore2 = heap_comparison_ignore_size(state.processStates[1].to_ignore, (const char*)real_area2 + i); if (ignore2 == ignore1) { if (ignore1 == 0) { check_ignore--; - return 0; + return false; } else { i = i + ignore2; check_ignore--; @@ -609,41 +517,33 @@ static int compare_heap_area_without_type( } } - if (MC_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { + if (MC_snapshot_region_memcmp((const char*)real_area1 + i, heap_region1, (const char*)real_area2 + i, heap_region2, + 1) != 0) { int pointer_align = (i / sizeof(void *)) * sizeof(void *); - const void* addr_pointed1 = snapshot1->read( - remote((void**)((char *) real_area1 + pointer_align)), process_index); - const void* addr_pointed2 = snapshot2->read( - remote((void**)((char *) real_area2 + pointer_align)), process_index); + const void* addr_pointed1 = snapshot1->read(remote((void**)((const char*)real_area1 + pointer_align))); + const void* addr_pointed2 = snapshot2->read(remote((void**)((const char*)real_area2 + pointer_align))); - if (process->in_maestro_stack(remote(addr_pointed1)) - && process->in_maestro_stack(remote(addr_pointed2))) { + if (process.in_maestro_stack(remote(addr_pointed1)) && process.in_maestro_stack(remote(addr_pointed2))) { i = pointer_align + sizeof(void *); continue; } - if (addr_pointed1 > state.std_heap_copy.heapbase - && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state.std_heap_copy.heapbase - && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) { - // Both addreses are in the heap: - int res_compare = compare_heap_area(state ,process_index, - addr_pointed1, addr_pointed2, - snapshot1, snapshot2, previous, nullptr, 0); - if (res_compare == 1) - return res_compare; + if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) { + // Both addresses are in the heap: + if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0)) + return true; i = pointer_align + sizeof(void *); continue; } - return 1; + return true; } i++; } - return 0; + return false; } /** @@ -658,188 +558,173 @@ static int compare_heap_area_without_type( * @param area_size either a byte_size or an elements_count (?) * @param check_ignore * @param pointer_level - * @return 0 (same), 1 (different), -1 (unknown) + * @return true when different, false otherwise (same or unknown) */ -static int compare_heap_area_with_type( - simgrid::mc::StateComparator& state, int process_index, - const void *real_area1, const void *real_area2, - simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, - HeapLocationPairs* previous, simgrid::mc::Type* type, - int area_size, int check_ignore, - int pointer_level) +static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, + const void* real_area2, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, + simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) { - do { - - // HACK: This should not happen but in pratice, there are some - // DW_TAG_typedef without an associated DW_AT_type: - //<1><538832>: Abbrev Number: 111 (DW_TAG_typedef) - // <538833> DW_AT_name : (indirect string, offset: 0x2292f3): gregset_t - // <538837> DW_AT_decl_file : 98 - // <538838> DW_AT_decl_line : 37 - if (type == nullptr) - return 0; + // HACK: This should not happen but in pratice, there are some + // DW_TAG_typedef without an associated DW_AT_type: + //<1><538832>: Abbrev Number: 111 (DW_TAG_typedef) + // <538833> DW_AT_name : (indirect string, offset: 0x2292f3): gregset_t + // <538837> DW_AT_decl_file : 98 + // <538838> DW_AT_decl_line : 37 + if (type == nullptr) + return false; + + if (is_stack(real_area1) && is_stack(real_area2)) + return false; + + if (check_ignore > 0) { + ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, real_area1); + if (ignore1 > 0 && heap_comparison_ignore_size(state.processStates[1].to_ignore, real_area2) == ignore1) + return false; + } - if (is_stack(real_area1) && is_stack(real_area2)) - return 0; + simgrid::mc::Type* subtype; + simgrid::mc::Type* subsubtype; + int elm_size; + const void* addr_pointed1; + const void* addr_pointed2; - if (check_ignore > 0) { - ssize_t ignore1 = heap_comparison_ignore_size(state.processStates[0].to_ignore, real_area1); - if (ignore1 > 0 && heap_comparison_ignore_size(state.processStates[1].to_ignore, real_area2) == ignore1) - return 0; - } + simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1); + simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2); - simgrid::mc::Type* subtype; - simgrid::mc::Type* subsubtype; - int elm_size; - const void* addr_pointed1; - const void* addr_pointed2; - - simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1); - simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2); - - switch (type->type) { - case DW_TAG_unspecified_type: - return 1; - - case DW_TAG_base_type: - if (not type->name.empty() && type->name == "char") { /* String, hence random (arbitrary ?) size */ - if (real_area1 == real_area2) - return -1; - else - 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; - } + switch (type->type) { + case DW_TAG_unspecified_type: + return true; - case DW_TAG_enumeration_type: + case DW_TAG_base_type: + if (not type->name.empty() && type->name == "char") { /* String, hence random (arbitrary ?) size */ + if (real_area1 == real_area2) + return false; + else + 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; - return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; - - case DW_TAG_typedef: - case DW_TAG_const_type: - case DW_TAG_volatile_type: - // Poor man's TCO: - type = type->subtype; - continue; // restart - - case DW_TAG_array_type: - subtype = type->subtype; - switch (subtype->type) { - case DW_TAG_unspecified_type: - return 1; - - case DW_TAG_base_type: - case DW_TAG_enumeration_type: - case DW_TAG_pointer_type: - case DW_TAG_reference_type: - case DW_TAG_rvalue_reference_type: - case DW_TAG_structure_type: - case DW_TAG_class_type: - case DW_TAG_union_type: - if (subtype->full_type) - subtype = subtype->full_type; - elm_size = subtype->byte_size; - break; - // TODO, just remove the type indirection? - case DW_TAG_const_type: - case DW_TAG_typedef: - case DW_TAG_volatile_type: - subsubtype = subtype->subtype; - if (subsubtype->full_type) - subsubtype = subsubtype->full_type; - elm_size = subsubtype->byte_size; - break; - default: - return 0; - } - for (int i = 0; i < type->element_count; i++) { - // TODO, add support for variable stride (DW_AT_byte_stride) - int res = compare_heap_area_with_type(state, process_index, (char*)real_area1 + (i * elm_size), - (char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous, - type->subtype, subtype->byte_size, check_ignore, pointer_level); - if (res == 1) - return res; - } - return 0; - - case DW_TAG_reference_type: - case DW_TAG_rvalue_reference_type: - case DW_TAG_pointer_type: - if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { - addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); - addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); + return false; + else + return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; + } + + case DW_TAG_enumeration_type: + if (area_size != -1 && type->byte_size != area_size) + return false; + return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; + + case DW_TAG_typedef: + case DW_TAG_const_type: + case DW_TAG_volatile_type: + return heap_area_differ_with_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, type->subtype, + area_size, check_ignore, pointer_level); + + case DW_TAG_array_type: + subtype = type->subtype; + switch (subtype->type) { + case DW_TAG_unspecified_type: + return true; + + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: + case DW_TAG_structure_type: + case DW_TAG_class_type: + case DW_TAG_union_type: + if (subtype->full_type) + subtype = subtype->full_type; + elm_size = subtype->byte_size; + break; + // TODO, just remove the type indirection? + case DW_TAG_const_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: + subsubtype = subtype->subtype; + if (subsubtype->full_type) + subsubtype = subsubtype->full_type; + elm_size = subsubtype->byte_size; + break; + default: + return false; + } + for (int i = 0; i < type->element_count; i++) { + // TODO, add support for variable stride (DW_AT_byte_stride) + if (heap_area_differ_with_type(state, (const char*)real_area1 + (i * elm_size), + (const char*)real_area2 + (i * elm_size), snapshot1, snapshot2, previous, + type->subtype, subtype->byte_size, check_ignore, pointer_level)) + return true; + } + return false; + + case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: + case DW_TAG_pointer_type: + if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { + addr_pointed1 = snapshot1->read(remote((void* const*)real_area1)); + addr_pointed2 = snapshot2->read(remote((void* const*)real_area2)); + return (addr_pointed1 != addr_pointed2); + } + pointer_level++; + if (pointer_level <= 1) { + addr_pointed1 = snapshot1->read(remote((void* const*)real_area1)); + addr_pointed2 = snapshot2->read(remote((void* const*)real_area2)); + if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) + return heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, + pointer_level); + else return (addr_pointed1 != addr_pointed2); + } + for (size_t i = 0; i < (area_size / sizeof(void*)); i++) { + addr_pointed1 = snapshot1->read(remote((void* const*)((const char*)real_area1 + i * sizeof(void*)))); + addr_pointed2 = snapshot2->read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*)))); + bool differ = is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2) + ? heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, + type->subtype, pointer_level) + : addr_pointed1 != addr_pointed2; + if (differ) + return true; + } + return false; + + case DW_TAG_structure_type: + case DW_TAG_class_type: + if (type->full_type) + type = type->full_type; + if (area_size != -1 && type->byte_size != area_size) { + if (area_size <= type->byte_size || area_size % type->byte_size != 0) + return false; + for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) { + if (heap_area_differ_with_type(state, (const char*)real_area1 + i * type->byte_size, + (const char*)real_area2 + i * type->byte_size, snapshot1, snapshot2, previous, + type, -1, check_ignore, 0)) + return true; } - pointer_level++; - if (pointer_level <= 1) { - 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 && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - return compare_heap_area(state, process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, - type->subtype, pointer_level); - else - return (addr_pointed1 != addr_pointed2); - } - for (size_t i = 0; i < (area_size / sizeof(void*)); i++) { - 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); - int res; - if (addr_pointed1 > state.std_heap_copy.heapbase && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) && - addr_pointed2 > state.std_heap_copy.heapbase && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - res = compare_heap_area(state, process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, - type->subtype, pointer_level); - else - res = (addr_pointed1 != addr_pointed2); - if (res == 1) - return res; - } - return 0; - - case DW_TAG_structure_type: - case DW_TAG_class_type: - if (type->full_type) - type = type->full_type; - if (area_size != -1 && type->byte_size != area_size) { - if (area_size <= type->byte_size || area_size % type->byte_size != 0) - return -1; - for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) { - int res = 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, check_ignore, 0); - if (res == 1) - return res; - } } else { for (simgrid::mc::Member& member : type->members) { // TODO, optimize this? (for the offset case) - void* real_member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, - (simgrid::mc::AddressSpace*)snapshot1, process_index); - void* real_member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, - (simgrid::mc::AddressSpace*)snapshot2, process_index); - int res = compare_heap_area_with_type(state, process_index, real_member1, real_member2, snapshot1, - snapshot2, previous, member.type, -1, check_ignore, 0); - if (res == 1) - return res; + void* real_member1 = + simgrid::dwarf::resolve_member(real_area1, type, &member, (simgrid::mc::AddressSpace*)snapshot1); + void* real_member2 = + simgrid::dwarf::resolve_member(real_area2, type, &member, (simgrid::mc::AddressSpace*)snapshot2); + if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous, + member.type, -1, check_ignore, 0)) + return true; } } - return 0; + return false; - case DW_TAG_union_type: - return compare_heap_area_without_type(state, process_index, real_area1, real_area2, snapshot1, snapshot2, - previous, type->byte_size, check_ignore); - - default: - return 0; - } + case DW_TAG_union_type: + return heap_area_differ_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, + type->byte_size, check_ignore); - xbt_die("Unreachable"); - } while (true); + default: + XBT_VERB("Unknown case: %d", type->type); + break; + } + return false; } /** Infer the type of a part of the block from the type of the block @@ -852,9 +737,8 @@ static int compare_heap_area_with_type( * @param area_size * @return DWARF type ID for given offset */ -static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc::Type* type, - int offset, int area_size, - simgrid::mc::Snapshot* snapshot, int process_index) +static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc::Type* type, int offset, int area_size, + simgrid::mc::Snapshot* snapshot) { // Beginning of the block, the infered variable type if the type of the block: @@ -880,7 +764,7 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: if (member.offset() == offset) return member.type; } else { - void* real_member = simgrid::dwarf::resolve_member(real_base_address, type, &member, snapshot, process_index); + void* real_member = simgrid::dwarf::resolve_member(real_base_address, type, &member, snapshot); if ((char*)real_member - (char*)real_base_address == offset) return member.type; } @@ -903,17 +787,13 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: * @param previous Pairs of blocks already compared on the current path (or nullptr) * @param type_id Type of variable * @param pointer_level - * @return 0 (same), 1 (different), -1 + * @return true when different, false otherwise (same or unknown) */ -static -int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, - const void *area1, const void *area2, - simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, - HeapLocationPairs* previous, - simgrid::mc::Type* type, int pointer_level) +static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2, + simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, + HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + const simgrid::mc::RemoteClient& process = mc_model_checker->process(); ssize_t block1; ssize_t block2; @@ -932,10 +812,10 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, bool match_pairs = false; // This is the address of std_heap->heapinfo in the application process: - void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; + void* heapinfo_address = &((xbt_mheap_t)process.heap_address)->heapinfo; - 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); + const malloc_info* heapinfos1 = snapshot1->read(remote((const malloc_info**)heapinfo_address)); + const malloc_info* heapinfos2 = snapshot2->read(remote((const malloc_info**)heapinfo_address)); malloc_info heapinfo_temp1; malloc_info heapinfo_temp2; @@ -952,17 +832,17 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, // If either block is a stack block: if (is_block_stack((int) block1) && is_block_stack((int) block2)) { - previous->insert(simgrid::mc::makeHeapLocationPair(block1, -1, block2, -1)); + previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}}); if (match_pairs) state.match_equals(previous); - return 0; + return false; } // If either block is not in the expected area of memory: if (((char*)area1 < (char*)state.std_heap_copy.heapbase) || (block1 > (ssize_t)state.processStates[0].heapsize) || (block1 < 1) || ((char*)area2 < (char*)state.std_heap_copy.heapbase) || (block2 > (ssize_t)state.processStates[1].heapsize) || (block2 < 1)) { - return 1; + return true; } // Process address of the block: @@ -986,20 +866,20 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, } - simgrid::mc::RegionSnapshot* heap_region1 = MC_get_heap_region(snapshot1); - simgrid::mc::RegionSnapshot* heap_region2 = MC_get_heap_region(snapshot2); + simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1); + simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2); - const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read( - heap_region1, &heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info)); - const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read( - heap_region2, &heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info)); + const malloc_info* heapinfo1 = + (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info)); + const malloc_info* heapinfo2 = + (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[block2], sizeof(malloc_info)); 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) state.match_equals(previous); - return 0; + return false; } if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { @@ -1011,7 +891,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, state.blocksEqual(block1, block2)) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size && @@ -1019,18 +899,17 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, (type->name.empty() || type->name == "struct s_smx_context")) { if (match_pairs) state.match_equals(previous); - return -1; + return false; } - if (heapinfo1->busy_block.size != heapinfo2->busy_block.size) - return 1; - if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) - return 1; + if (heapinfo1->busy_block.size != heapinfo2->busy_block.size || + heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) + return true; - if (not previous->insert(simgrid::mc::makeHeapLocationPair(block1, -1, block2, -1)).second) { + if (not previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}}).second) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } size = heapinfo1->busy_block.busy_size; @@ -1045,7 +924,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (size <= 0) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } if (heapinfo1->busy_block.ignore > 0 @@ -1067,14 +946,14 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, if (heapinfo1->busy_frag.frag_size[frag1] == -1 || heapinfo2->busy_frag.frag_size[frag2] == -1) { if (match_pairs) state.match_equals(previous); - return -1; + return false; } // ? if (type_size != heapinfo1->busy_frag.frag_size[frag1] || type_size != heapinfo2->busy_frag.frag_size[frag2]) { if (match_pairs) state.match_equals(previous); - return -1; + return false; } } @@ -1083,16 +962,16 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, state.fragmentsEqual(block1, frag1, block2, frag2)) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } // Compare the size of both fragments: if (heapinfo1->busy_frag.frag_size[frag1] != heapinfo2->busy_frag.frag_size[frag2]) { if (type_size == -1) { if (match_pairs) state.match_equals(previous); - return -1; + return false; } else - return 1; + return true; } // Size of the fragment_: @@ -1116,24 +995,18 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, offset2 = (char*)area2 - (char*)real_addr_frag2; if (state.types1_(block1, frag1) != nullptr && state.types2_(block2, frag2) != nullptr) { - new_type1 = - get_offset_type(real_addr_frag1, state.types1_(block1, frag1), offset1, size, snapshot1, process_index); - new_type2 = - get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset1, size, snapshot2, process_index); + new_type1 = get_offset_type(real_addr_frag1, state.types1_(block1, frag1), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset1, size, snapshot2); } else if (state.types1_(block1, frag1) != nullptr) { - new_type1 = - get_offset_type(real_addr_frag1, state.types1_(block1, frag1), offset1, size, snapshot1, process_index); - new_type2 = - get_offset_type(real_addr_frag2, state.types1_(block1, frag1), offset2, size, snapshot2, process_index); + new_type1 = get_offset_type(real_addr_frag1, state.types1_(block1, frag1), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types1_(block1, frag1), offset2, size, snapshot2); } else if (state.types2_(block2, frag2) != nullptr) { - new_type1 = - get_offset_type(real_addr_frag1, state.types2_(block2, frag2), offset1, size, snapshot1, process_index); - new_type2 = - get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset2, size, snapshot2, process_index); + new_type1 = get_offset_type(real_addr_frag1, state.types2_(block2, frag2), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset2, size, snapshot2); } else { if (match_pairs) state.match_equals(previous); - return -1; + return false; } if (new_type1 != nullptr && new_type2 != nullptr && new_type1 != new_type2) { @@ -1151,7 +1024,7 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, } else { if (match_pairs) state.match_equals(previous); - return -1; + return false; } } @@ -1161,16 +1034,16 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, } if (offset1 == 0 && offset2 == 0 && - not previous->insert(simgrid::mc::makeHeapLocationPair(block1, frag1, block2, frag2)).second) { + not previous->insert(HeapLocationPair{{HeapLocation(block1, frag1), HeapLocation(block2, frag2)}}).second) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } if (size <= 0) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } if ((heapinfo1->busy_frag.ignore[frag1] > 0) && @@ -1178,24 +1051,19 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, check_ignore = heapinfo1->busy_frag.ignore[frag1]; } else - return 1; - + return true; /* Start comparison */ - int res_compare; - if (type) - res_compare = 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, process_index, area1, area2, snapshot1, snapshot2, previous, - size, check_ignore); - - if (res_compare == 1) - return res_compare; + bool differ = + type ? heap_area_differ_with_type(state, area1, area2, snapshot1, snapshot2, previous, type, size, check_ignore, + pointer_level) + : heap_area_differ_without_type(state, area1, area2, snapshot1, snapshot2, previous, size, check_ignore); + if (differ) + return true; if (match_pairs) state.match_equals(previous); - return 0; + return false; } } @@ -1204,171 +1072,140 @@ int compare_heap_area(simgrid::mc::StateComparator& state, int process_index, /************************** Snapshot comparison *******************************/ /******************************************************************************/ -static int compare_areas_with_type(simgrid::mc::StateComparator& state, int process_index, void* real_area1, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::RegionSnapshot* region1, - void* real_area2, simgrid::mc::Snapshot* snapshot2, - simgrid::mc::RegionSnapshot* region2, simgrid::mc::Type* type, int pointer_level) +static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, + simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1, + const void* real_area2, simgrid::mc::Snapshot* snapshot2, + simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); - simgrid::mc::Type* subtype; simgrid::mc::Type* subsubtype; int elm_size; int i; - int res; - - do { - xbt_assert(type != nullptr); - switch (type->type) { - case DW_TAG_unspecified_type: - return 1; - - case DW_TAG_base_type: - case DW_TAG_enumeration_type: - case DW_TAG_union_type: - return MC_snapshot_region_memcmp(real_area1, region1, real_area2, region2, type->byte_size) != 0; - case DW_TAG_typedef: - case DW_TAG_volatile_type: - case DW_TAG_const_type: - // Poor man's TCO: - type = type->subtype; - continue; // restart - case DW_TAG_array_type: - subtype = type->subtype; - switch (subtype->type) { - case DW_TAG_unspecified_type: - return 1; - - case DW_TAG_base_type: - case DW_TAG_enumeration_type: - case DW_TAG_pointer_type: - case DW_TAG_reference_type: - case DW_TAG_rvalue_reference_type: - case DW_TAG_structure_type: - case DW_TAG_class_type: - case DW_TAG_union_type: - if (subtype->full_type) - subtype = subtype->full_type; - elm_size = subtype->byte_size; - break; - case DW_TAG_const_type: - case DW_TAG_typedef: - case DW_TAG_volatile_type: - subsubtype = subtype->subtype; - if (subsubtype->full_type) - subsubtype = subsubtype->full_type; - elm_size = subsubtype->byte_size; - break; - default: - return 0; - } - for (i = 0; i < type->element_count; i++) { - size_t off = i * elm_size; - res = compare_areas_with_type(state, process_index, (char*)real_area1 + off, snapshot1, region1, - (char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level); - if (res == 1) - return res; - } - break; - case DW_TAG_pointer_type: - case DW_TAG_reference_type: - case DW_TAG_rvalue_reference_type: { - void* addr_pointed1 = MC_region_read_pointer(region1, real_area1); - void* addr_pointed2 = MC_region_read_pointer(region2, real_area2); - - if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) - return (addr_pointed1 != addr_pointed2); - if (addr_pointed1 == nullptr && addr_pointed2 == nullptr) - return 0; - if (addr_pointed1 == nullptr || addr_pointed2 == nullptr) - return 1; - if (not state.compared_pointers.insert(std::make_pair(addr_pointed1, addr_pointed2)).second) - return 0; - - pointer_level++; - - // Some cases are not handled here: - // * the pointers lead to different areas (one to the heap, the other to the RW segment ...) - // * a pointer leads to the read-only segment of the current object - // * a pointer lead to a different ELF object - - if (addr_pointed1 > process->heap_address && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) { - if (not(addr_pointed2 > process->heap_address && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))) - return 1; - // The pointers are both in the heap: - return simgrid::mc::compare_heap_area(state, process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, nullptr, type->subtype, pointer_level); - - } else if (region1->contain(simgrid::mc::remote(addr_pointed1))) { - // The pointers are both in the current object R/W segment: - if (not region2->contain(simgrid::mc::remote(addr_pointed2))) - return 1; - if (not type->type_id) - return (addr_pointed1 != addr_pointed2); - else - return compare_areas_with_type(state, process_index, addr_pointed1, snapshot1, region1, addr_pointed2, - snapshot2, region2, type->subtype, pointer_level); - } else { - // TODO, We do not handle very well the case where - // it belongs to a different (non-heap) region from the current one. + xbt_assert(type != nullptr); + switch (type->type) { + case DW_TAG_unspecified_type: + return true; + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_union_type: + return MC_snapshot_region_memcmp(real_area1, region1, real_area2, region2, type->byte_size) != 0; + case DW_TAG_typedef: + case DW_TAG_volatile_type: + case DW_TAG_const_type: + return areas_differ_with_type(state, real_area1, snapshot1, region1, real_area2, snapshot2, region2, + type->subtype, pointer_level); + case DW_TAG_array_type: + subtype = type->subtype; + switch (subtype->type) { + case DW_TAG_unspecified_type: + return true; + + case DW_TAG_base_type: + case DW_TAG_enumeration_type: + case DW_TAG_pointer_type: + case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: + case DW_TAG_structure_type: + case DW_TAG_class_type: + case DW_TAG_union_type: + if (subtype->full_type) + subtype = subtype->full_type; + elm_size = subtype->byte_size; + break; + case DW_TAG_const_type: + case DW_TAG_typedef: + case DW_TAG_volatile_type: + subsubtype = subtype->subtype; + if (subsubtype->full_type) + subsubtype = subsubtype->full_type; + elm_size = subsubtype->byte_size; + break; + default: + return false; + } + for (i = 0; i < type->element_count; i++) { + size_t off = i * elm_size; + if (areas_differ_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off, + snapshot2, region2, type->subtype, pointer_level)) + return true; + } + break; + case DW_TAG_pointer_type: + case DW_TAG_reference_type: + case DW_TAG_rvalue_reference_type: { + const void* addr_pointed1 = MC_region_read_pointer(region1, real_area1); + const void* addr_pointed2 = MC_region_read_pointer(region2, real_area2); + + if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) + return (addr_pointed1 != addr_pointed2); + if (addr_pointed1 == nullptr && addr_pointed2 == nullptr) + return false; + if (addr_pointed1 == nullptr || addr_pointed2 == nullptr) + return true; + if (not state.compared_pointers.insert(std::make_pair(addr_pointed1, addr_pointed2)).second) + return false; + + pointer_level++; + + // Some cases are not handled here: + // * the pointers lead to different areas (one to the heap, the other to the RW segment ...) + // * a pointer leads to the read-only segment of the current object + // * a pointer lead to a different ELF object + + if (is_on_heap(addr_pointed1)) { + if (not is_on_heap(addr_pointed2)) + return true; + // The pointers are both in the heap: + return simgrid::mc::heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr, + type->subtype, pointer_level); + + } else if (region1->contain(simgrid::mc::remote(addr_pointed1))) { + // The pointers are both in the current object R/W segment: + if (not region2->contain(simgrid::mc::remote(addr_pointed2))) + return true; + if (not type->type_id) return (addr_pointed1 != addr_pointed2); - } + else + return areas_differ_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2, + type->subtype, pointer_level); + } else { + + // TODO, We do not handle very well the case where + // it belongs to a different (non-heap) region from the current one. + + return (addr_pointed1 != addr_pointed2); } - case DW_TAG_structure_type: - case DW_TAG_class_type: - for (simgrid::mc::Member& member : type->members) { - void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1, process_index); - void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2, process_index); - simgrid::mc::RegionSnapshot* subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1); - simgrid::mc::RegionSnapshot* subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2); - res = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2, - subregion2, member.type, pointer_level); - if (res == 1) - return res; - } - break; - case DW_TAG_subroutine_type: - return -1; - default: - XBT_VERB("Unknown case: %d", type->type); - break; } + case DW_TAG_structure_type: + case DW_TAG_class_type: + for (simgrid::mc::Member& member : type->members) { + void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, snapshot1); + void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, snapshot2); + simgrid::mc::Region* subregion1 = snapshot1->get_region(member1, region1); // region1 is hinted + simgrid::mc::Region* subregion2 = snapshot2->get_region(member2, region2); // region2 is hinted + if (areas_differ_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, member.type, + pointer_level)) + return true; + } + break; + case DW_TAG_subroutine_type: + return false; + default: + XBT_VERB("Unknown case: %d", type->type); + break; + } - return 0; - } while (true); + return false; } -static int compare_global_variables(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info, - int process_index, simgrid::mc::RegionSnapshot* r1, simgrid::mc::RegionSnapshot* r2, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2) +static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info, + simgrid::mc::Region* r1, simgrid::mc::Region* r2, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2) { xbt_assert(r1 && r2, "Missing region."); -#if HAVE_SMPI - if (r1->storage_type() == simgrid::mc::StorageType::Privatized) { - xbt_assert(process_index >= 0); - if (r2->storage_type() != simgrid::mc::StorageType::Privatized) - return 1; - - size_t process_count = MC_smpi_process_count(); - xbt_assert(process_count == r1->privatized_data().size() - && process_count == r2->privatized_data().size()); - - // Compare the global variables separately for each simulates process: - for (size_t i = 0; i < process_count; i++) { - if (compare_global_variables(state, object_info, i, &r1->privatized_data()[i], &r2->privatized_data()[i], - snapshot1, snapshot2)) - return 1; - } - return 0; - } -#else - xbt_assert(r1->storage_type() != simgrid::mc::StorageType::Privatized); -#endif - xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized); - std::vector& variables = object_info->global_variables; for (simgrid::mc::Variable const& current_var : variables) { @@ -1381,191 +1218,115 @@ static int compare_global_variables(simgrid::mc::StateComparator& state, simgrid continue; simgrid::mc::Type* bvariable_type = current_var.type; - int res = compare_areas_with_type(state, process_index, - (char *) current_var.address, snapshot1, r1, - (char *) current_var.address, snapshot2, r2, - bvariable_type, 0); - if (res == 1) { + if (areas_differ_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address, snapshot2, + r2, bvariable_type, 0)) { XBT_VERB("Global variable %s (%p) is different between snapshots", current_var.name.c_str(), (char *) current_var.address); - return 1; + return true; } } - return 0; + return false; } -static int compare_local_variables(simgrid::mc::StateComparator& state, - int process_index, - simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, - mc_snapshot_stack_t stack1, +static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1, mc_snapshot_stack_t stack2) { if (stack1->local_variables.size() != stack2->local_variables.size()) { XBT_VERB("Different number of local variables"); - return 1; + return true; } - unsigned int cursor = 0; - local_variable_t current_var1; - local_variable_t current_var2; - while (cursor < stack1->local_variables.size()) { - current_var1 = &stack1->local_variables[cursor]; - current_var2 = &stack1->local_variables[cursor]; - if (current_var1->name != current_var2->name - || current_var1->subprogram != current_var2->subprogram - || current_var1->ip != current_var2->ip) { - // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram - XBT_VERB - ("Different name of variable (%s - %s) " - "or frame (%s - %s) or ip (%lu - %lu)", - current_var1->name.c_str(), - current_var2->name.c_str(), - current_var1->subprogram->name.c_str(), - current_var2->subprogram->name.c_str(), - current_var1->ip, current_var2->ip); - return 1; - } + for (unsigned int cursor = 0; cursor < stack1->local_variables.size(); cursor++) { + local_variable_t current_var1 = &stack1->local_variables[cursor]; + local_variable_t current_var2 = &stack2->local_variables[cursor]; + if (current_var1->name != current_var2->name || current_var1->subprogram != current_var2->subprogram || + current_var1->ip != current_var2->ip) { // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram + XBT_VERB("Different name of variable (%s - %s) " + "or frame (%s - %s) or ip (%lu - %lu)", + current_var1->name.c_str(), current_var2->name.c_str(), current_var1->subprogram->name.c_str(), + current_var2->subprogram->name.c_str(), current_var1->ip, current_var2->ip); + return true; + } - simgrid::mc::Type* subtype = current_var1->type; - int res = compare_areas_with_type( - state, process_index, current_var1->address, snapshot1, - mc_get_snapshot_region(current_var1->address, snapshot1, process_index), current_var2->address, snapshot2, - mc_get_snapshot_region(current_var2->address, snapshot2, process_index), subtype, 0); - - if (res == 1) { - // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram - XBT_VERB("Local variable %s (%p - %p) in frame %s " - "is different between snapshots", - current_var1->name.c_str(), current_var1->address, current_var2->address, - current_var1->subprogram->name.c_str()); - return res; - } - cursor++; + if (areas_differ_with_type(state, current_var1->address, snapshot1, snapshot1->get_region(current_var1->address), + current_var2->address, snapshot2, snapshot2->get_region(current_var2->address), + current_var1->type, 0)) { + XBT_VERB("Local variable %s (%p - %p) in frame %s " + "is different between snapshots", + current_var1->name.c_str(), current_var1->address, current_var2->address, + current_var1->subprogram->name.c_str()); + return true; } - return 0; + } + return false; } namespace simgrid { namespace mc { -static std::unique_ptr state_comparator; - -int snapshot_compare(int num1, Snapshot* s1, int num2, Snapshot* s2) +bool snapshot_equal(Snapshot* s1, Snapshot* s2) { // TODO, make this a field of ModelChecker or something similar + static StateComparator state_comparator; + + const RemoteClient& process = mc_model_checker->process(); - if (state_comparator == nullptr) - state_comparator.reset(new StateComparator()); - else - state_comparator->clear(); - - RemoteClient* process = &mc_model_checker->process(); - - int errors = 0; - - int hash_result = 0; - if (_sg_mc_hash) { - hash_result = (s1->hash != s2->hash); - if (hash_result) { - XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash); -#ifndef MC_DEBUG - return 1; -#endif - } else - XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, num1, num2, s1->hash); + if (s1->hash_ != s2->hash_) { + XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_, + s2->hash_); + return false; } + XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_); /* Compare enabled processes */ - if (s1->enabled_processes != s2->enabled_processes) { - XBT_VERB("(%d - %d) Different amount of enabled processes", num1, num2); - return 1; + if (s1->enabled_processes_ != s2->enabled_processes_) { + XBT_VERB("(%d - %d) Different amount of enabled processes", s1->num_state_, s2->num_state_); + return false; } /* Compare size of stacks */ - int is_diff = 0; - for (unsigned long i = 0; i < s1->stacks.size(); i++) { - size_t size_used1 = s1->stack_sizes[i]; - size_t size_used2 = s2->stack_sizes[i]; + for (unsigned long i = 0; i < s1->stacks_.size(); i++) { + size_t size_used1 = s1->stack_sizes_[i]; + size_t size_used2 = s2->stack_sizes_[i]; if (size_used1 != size_used2) { -#ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2); - errors++; - is_diff = 1; -#else -#ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", num1, num2, size_used1, size_used2); -#endif - return 1; -#endif + XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", s1->num_state_, s2->num_state_, size_used1, + size_used2); + return false; } } - if (is_diff) // do not proceed if there is any stacks that don't match - return 1; /* Init heap information used in heap comparison algorithm */ - xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes( - alloca(sizeof(struct mdesc)), sizeof(struct mdesc), - remote(process->heap_address), - simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy()); - xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes( - alloca(sizeof(struct mdesc)), sizeof(struct mdesc), - remote(process->heap_address), - simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy()); - int res_init = state_comparator->initHeapInformation(heap1, heap2, &s1->to_ignore, &s2->to_ignore); - - if (res_init == -1) { -#ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different heap information", num1, num2); - errors++; -#else -#ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different heap information", num1, num2); -#endif - - return 1; -#endif + xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + remote(process.heap_address), simgrid::mc::ReadOptions::lazy()); + xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + remote(process.heap_address), simgrid::mc::ReadOptions::lazy()); + if (state_comparator.initHeapInformation(heap1, heap2, &s1->to_ignore_, &s2->to_ignore_) == -1) { + XBT_VERB("(%d - %d) Different heap information", s1->num_state_, s2->num_state_); + return false; } /* Stacks comparison */ - int diff_local = 0; - for (unsigned int cursor = 0; cursor < s1->stacks.size(); cursor++) { - mc_snapshot_stack_t stack1 = &s1->stacks[cursor]; - mc_snapshot_stack_t stack2 = &s2->stacks[cursor]; - - if (stack1->process_index != stack2->process_index) { - diff_local = 1; - XBT_DEBUG("(%d - %d) Stacks with different process index (%i vs %i)", num1, num2, - stack1->process_index, stack2->process_index); - } - else diff_local = compare_local_variables(*state_comparator, - stack1->process_index, s1, s2, stack1, stack2); - if (diff_local > 0) { -#ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1, - num2, cursor + 1); - errors++; -#else - -#ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different local variables between stacks %u", num1, num2, cursor + 1); -#endif - - return 1; -#endif + for (unsigned int cursor = 0; cursor < s1->stacks_.size(); cursor++) { + mc_snapshot_stack_t stack1 = &s1->stacks_[cursor]; + mc_snapshot_stack_t stack2 = &s2->stacks_[cursor]; + + if (local_variables_differ(state_comparator, s1, s2, stack1, stack2)) { + XBT_VERB("(%d - %d) Different local variables between stacks %u", s1->num_state_, s2->num_state_, cursor + 1); + return false; } } - size_t regions_count = s1->snapshot_regions.size(); - // TODO, raise a difference instead? - xbt_assert(regions_count == s2->snapshot_regions.size()); + size_t regions_count = s1->snapshot_regions_.size(); + if (regions_count != s2->snapshot_regions_.size()) + return false; for (size_t k = 0; k != regions_count; ++k) { - RegionSnapshot* region1 = s1->snapshot_regions[k].get(); - RegionSnapshot* region2 = s2->snapshot_regions[k].get(); + Region* region1 = s1->snapshot_regions_[k].get(); + Region* region2 = s2->snapshot_regions_[k].get(); // Preconditions: if (region1->region_type() != RegionType::Data) @@ -1575,60 +1336,23 @@ int snapshot_compare(int num1, Snapshot* s1, int num2, Snapshot* s2) xbt_assert(region1->object_info() == region2->object_info()); xbt_assert(region1->object_info()); - std::string const& name = region1->object_info()->file_name; - /* Compare global variables */ - if (compare_global_variables(*state_comparator, region1->object_info(), simgrid::mc::ProcessIndexDisabled, region1, - region2, s1, s2)) { - -#ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different global variables in %s", - num1, num2, name.c_str()); - errors++; -#else -#ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different global variables in %s", - num1, num2, name.c_str()); -#endif - - return 1; -#endif + if (global_variables_differ(state_comparator, region1->object_info(), region1, region2, s1, s2)) { + std::string const& name = region1->object_info()->file_name; + XBT_VERB("(%d - %d) Different global variables in %s", s1->num_state_, s2->num_state_, name.c_str()); + return false; } } /* Compare heap */ - if (mmalloc_compare_heap(*state_comparator, s1, s2) > 0) { - -#ifdef MC_DEBUG - XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2); - errors++; -#else - -#ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2); -#endif - return 1; -#endif + if (mmalloc_heap_differ(state_comparator, s1, s2)) { + XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_); + return false; } -#ifdef MC_VERBOSE - if (errors || hash_result) - XBT_VERB("(%d - %d) Difference found", num1, num2); - else - XBT_VERB("(%d - %d) No difference found", num1, num2); -#endif - -#if defined(MC_DEBUG) && defined(MC_VERBOSE) - if (_sg_mc_hash) { - // * false positive SHOULD be avoided. - // * There MUST not be any false negative. - - XBT_VERB("(%d - %d) State equality hash test is %s %s", num1, num2, - (hash_result != 0) == (errors != 0) ? "true" : "false", not hash_result ? "positive" : "negative"); - } -#endif + XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_); - return errors > 0 || hash_result; + return true; } }