X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c79ec1de5b266ba27e433dbac9bef2edf258341f..61ca498cecddb9899801287b32c2bad7da025c44:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index b0ed50f549..b8071a78c7 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -12,29 +12,14 @@ 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, 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; @@ -53,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: @@ -76,85 +55,47 @@ public: class ProcessComparisonState { public: - std::vector* to_ignore = nullptr; + const std::vector* to_ignore = nullptr; std::vector equals_to; std::vector types; std::size_t heapsize = 0; - 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); - } + void initHeapInformation(xbt_mheap_t heap, const std::vector& i); }; -} - 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() { compared_pointers.clear(); } - int initHeapInformation( - xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2); + int initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector& i1, + const std::vector& i2); - HeapArea& equals_to1_(std::size_t i, std::size_t j) - { - return processStates[0].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; - } - HeapArea& equals_to2_(std::size_t i, std::size_t j) + template HeapArea& equals_to_(std::size_t i, std::size_t j) { - return processStates[1].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + return processStates[rank - 1].equals_to[MAX_FRAGMENT_PER_BLOCK * i + j]; } - Type*& types1_(std::size_t i, std::size_t j) + template Type*& types_(std::size_t i, std::size_t j) { - return processStates[0].types[ MAX_FRAGMENT_PER_BLOCK * i + j]; - } - Type*& types2_(std::size_t i, std::size_t j) - { - return processStates[1].types[ MAX_FRAGMENT_PER_BLOCK * i + j]; + return processStates[rank - 1].types[MAX_FRAGMENT_PER_BLOCK * i + j]; } - HeapArea const& equals_to1_(std::size_t i, std::size_t j) const - { - return processStates[0].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; - } - HeapArea const& equals_to2_(std::size_t i, std::size_t j) const - { - return processStates[1].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; - } - Type* const& types1_(std::size_t i, std::size_t j) const + template HeapArea const& equals_to_(std::size_t i, std::size_t j) const { - return processStates[0].types[ MAX_FRAGMENT_PER_BLOCK * i + j]; + return processStates[rank - 1].equals_to[MAX_FRAGMENT_PER_BLOCK * i + j]; } - Type* const& types2_(std::size_t i, std::size_t j) const + template Type* const& types_(std::size_t i, std::size_t j) const { - return processStates[1].types[ MAX_FRAGMENT_PER_BLOCK * i + j]; + return processStates[rank - 1].types[MAX_FRAGMENT_PER_BLOCK * i + j]; } /** Check whether two blocks are known to be matching @@ -165,7 +106,7 @@ public: */ bool blocksEqual(int b1, int b2) const { - return this->equals_to1_(b1, 0).block_ == b2 && this->equals_to2_(b2, 0).block_ == b1; + return this->equals_to_<1>(b1, 0).block_ == b2 && this->equals_to_<2>(b2, 0).block_ == b1; } /** Check whether two fragments are known to be matching @@ -178,8 +119,8 @@ public: */ int fragmentsEqual(int b1, int f1, int b2, int f2) const { - return this->equals_to1_(b1, f1).block_ == b2 && this->equals_to1_(b1, f1).fragment_ == f2 && - this->equals_to2_(b2, f2).block_ == b1 && this->equals_to2_(b2, f2).fragment_ == f1; + return this->equals_to_<1>(b1, f1).block_ == b2 && this->equals_to_<1>(b1, f1).fragment_ == f2 && + this->equals_to_<2>(b2, f2).block_ == b1 && this->equals_to_<2>(b2, f2).fragment_ == f1; } void match_equals(HeapLocationPairs* list); @@ -190,9 +131,8 @@ public: /************************************************************************************/ -static ssize_t heap_comparison_ignore_size( - std::vector* ignore_list, - const void *address) +static ssize_t heap_comparison_ignore_size(const std::vector* ignore_list, + const void* address) { int start = 0; int end = ignore_list->size() - 1; @@ -235,28 +175,27 @@ void StateComparator::match_equals(HeapLocationPairs* list) { for (auto const& pair : *list) { if (pair[0].fragment_ != -1) { - this->equals_to1_(pair[0].block_, pair[0].fragment_) = simgrid::mc::HeapArea(pair[1].block_, pair[1].fragment_); - this->equals_to2_(pair[1].block_, pair[1].fragment_) = simgrid::mc::HeapArea(pair[0].block_, pair[0].fragment_); + this->equals_to_<1>(pair[0].block_, pair[0].fragment_) = simgrid::mc::HeapArea(pair[1].block_, pair[1].fragment_); + this->equals_to_<2>(pair[1].block_, pair[1].fragment_) = simgrid::mc::HeapArea(pair[0].block_, pair[0].fragment_); } else { - this->equals_to1_(pair[0].block_, 0) = simgrid::mc::HeapArea(pair[1].block_, pair[1].fragment_); - this->equals_to2_(pair[1].block_, 0) = simgrid::mc::HeapArea(pair[0].block_, pair[0].fragment_); + this->equals_to_<1>(pair[0].block_, 0) = simgrid::mc::HeapArea(pair[1].block_, pair[1].fragment_); + this->equals_to_<2>(pair[1].block_, 0) = simgrid::mc::HeapArea(pair[0].block_, pair[0].fragment_); } } } -void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, - std::vector* i) +void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::vector& i) { auto heaplimit = heap->heaplimit; this->heapsize = heap->heapsize; - this->to_ignore = i; + this->to_ignore = &i; this->equals_to.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, HeapArea()); this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr); } int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2) + const std::vector& i1, + const std::vector& i2) { if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize)) return -1; @@ -268,18 +207,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 Region* MC_get_heap_region(Snapshot* snapshot) +static inline Region* MC_get_heap_region(const 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 bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2) +static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, const Snapshot& snapshot1, + const Snapshot& snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level); + +static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, const simgrid::mc::Snapshot& snapshot1, + const simgrid::mc::Snapshot& snapshot2) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + const simgrid::mc::RemoteClient& process = mc_model_checker->process(); /* Check busy blocks */ size_t i1 = 1; @@ -292,13 +234,13 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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)); + snapshot1.read(RemotePtr((std::uint64_t)heapinfo_address)); const malloc_info* heapinfos2 = - snapshot2->read(RemotePtr((std::uint64_t)heapinfo_address)); + snapshot2.read(RemotePtr((std::uint64_t)heapinfo_address)); while (i1 < state.heaplimit) { @@ -312,10 +254,7 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: continue; } - if (heapinfo1->type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); - abort(); - } + xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type); void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); @@ -323,14 +262,14 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: if (is_stack(addr_block1)) { for (size_t k = 0; k < heapinfo1->busy_block.size; k++) - state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1); + state.equals_to_<1>(i1 + k, 0) = HeapArea(i1, -1); for (size_t k = 0; k < heapinfo2->busy_block.size; k++) - state.equals_to2_(i1 + k, 0) = HeapArea(i1, -1); + state.equals_to_<2>(i1 + k, 0) = HeapArea(i1, -1); i1 += heapinfo1->busy_block.size; continue; } - if (state.equals_to1_(i1, 0).valid_) { + if (state.equals_to_<1>(i1, 0).valid_) { i1++; continue; } @@ -339,14 +278,13 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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) { + if (heapinfo2->type == heapinfo1->type && state.equals_to_<2>(i1, 0).valid_ == 0) { void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; - int res_compare = compare_heap_area(state, 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); + state.equals_to_<2>(i1 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) - state.equals_to1_(i1 + k, 0) = HeapArea(i1, -1); + state.equals_to_<1>(i1 + k, 0) = HeapArea(i1, -1); equal = true; i1 += heapinfo1->busy_block.size; } @@ -369,18 +307,16 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: continue; } - if (state.equals_to2_(i2, 0).valid_) { + if (state.equals_to_<2>(i2, 0).valid_) { i2++; continue; } - int res_compare = compare_heap_area(state, 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); + state.equals_to_<2>(i2 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) - state.equals_to1_(i1 + k, 0) = HeapArea(i2, -1); + state.equals_to_<1>(i1 + k, 0) = HeapArea(i2, -1); equal = true; i1 += heapinfo1->busy_block.size; } @@ -390,8 +326,7 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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; - return false; + return true; } } else { /* Fragmented block */ @@ -401,7 +336,7 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: if (heapinfo1->busy_frag.frag_size[j1] == -1) /* Free fragment_ */ continue; - if (state.equals_to1_(i1, j1).valid_) + if (state.equals_to_<1>(i1, j1).valid_) continue; void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type)); @@ -410,11 +345,10 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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_) { + if (heapinfo2->type == heapinfo1->type && not state.equals_to_<2>(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, 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; } @@ -434,25 +368,20 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: continue; } - if (heapinfo2b->type < 0) { - fprintf(stderr, "Unknown mmalloc block type.\n"); - abort(); - } + xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type); for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) { if (i2 == i1 && j2 == j1) continue; - if (state.equals_to2_(i2, j2).valid_) + if (state.equals_to_<2>(i2, j2).valid_) continue; 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, 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; } @@ -464,8 +393,7 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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; - return false; + return true; } } @@ -479,17 +407,17 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: (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_) { + not state.equals_to_<1>(i, 0).valid_) { XBT_DEBUG("Block %zu not found (size used = %zu)", i, heapinfo1->busy_block.busy_size); - return false; + return true; } if (heapinfo1->type <= 0) continue; 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_) { + if (i1 == state.heaplimit && heapinfo1->busy_frag.frag_size[j] > 0 && not state.equals_to_<1>(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo1->busy_frag.frag_size[j]); - return false; + return true; } } @@ -497,24 +425,24 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: 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_) { + not state.equals_to_<2>(i, 0).valid_) { XBT_DEBUG("Block %zu not found (size used = %zu)", i, heapinfo2->busy_block.busy_size); - return false; + return true; } if (heapinfo2->type <= 0) continue; for (size_t j = 0; j < (size_t)(BLOCKSIZE >> heapinfo2->type); j++) - if (i1 == state.heaplimit && heapinfo2->busy_frag.frag_size[j] > 0 && not state.equals_to2_(i, j).valid_) { + if (i1 == state.heaplimit && heapinfo2->busy_frag.frag_size[j] > 0 && not state.equals_to_<2>(i, j).valid_) { XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", i, j, heapinfo2->busy_frag.frag_size[j]); - return false; + return true; } } - return true; + return false; } /** @@ -527,26 +455,27 @@ static bool mmalloc_heap_equal(simgrid::mc::StateComparator& state, simgrid::mc: * @param previous * @param size * @param check_ignore + * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_equal_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) +static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1, + const void* real_area2, const simgrid::mc::Snapshot& snapshot1, + const simgrid::mc::Snapshot& snapshot2, HeapLocationPairs* previous, int size, + int check_ignore) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + 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 true; + return false; } else { i = i + ignore2; check_ignore--; @@ -556,38 +485,33 @@ static bool heap_area_equal_without_type(simgrid::mc::StateComparator& state, co } } - 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))); - const void* addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + pointer_align))); + 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)) { + if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)) { // Both addresses are in the heap: - int res_compare = - compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0); - if (res_compare == 1) - return false; + if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0)) + return true; i = pointer_align + sizeof(void *); continue; } - return false; + return true; } i++; } - return true; + return false; } /** @@ -602,11 +526,11 @@ static bool heap_area_equal_without_type(simgrid::mc::StateComparator& state, co * @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, const void* real_area1, - const void* real_area2, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, +static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, + const void* real_area2, const simgrid::mc::Snapshot& snapshot1, + const simgrid::mc::Snapshot& snapshot2, HeapLocationPairs* previous, simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) { // HACK: This should not happen but in pratice, there are some @@ -616,15 +540,15 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons // <538837> DW_AT_decl_file : 98 // <538838> DW_AT_decl_line : 37 if (type == nullptr) - return 0; + return false; if (is_stack(real_area1) && is_stack(real_area2)) - return 0; + 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 0; + return false; } simgrid::mc::Type* subtype; @@ -638,37 +562,37 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons switch (type->type) { case DW_TAG_unspecified_type: - return 1; + return true; 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; + 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 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 -1; + 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 compare_heap_area_with_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, type->subtype, - area_size, check_ignore, pointer_level); + 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 1; + return true; case DW_TAG_base_type: case DW_TAG_enumeration_type: @@ -692,51 +616,46 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons elm_size = subsubtype->byte_size; break; default: - return 0; + return false; } 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, (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; + 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 0; + 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**)real_area1)); - addr_pointed2 = snapshot2->read(remote((void**)real_area2)); + 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**)real_area1)); - addr_pointed2 = snapshot2->read(remote((void**)real_area2)); - 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, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, - pointer_level); + addr_pointed1 = snapshot1.read(remote((void* const*)real_area1)); + addr_pointed2 = snapshot2.read(remote((void* const*)real_area2)); + if (snapshot1.on_heap(addr_pointed1) && snapshot2.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**)((char*)real_area1 + i * sizeof(void*)))); - addr_pointed2 = snapshot2->read(remote((void**)((char*)real_area2 + i * sizeof(void*)))); - 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, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, type->subtype, - pointer_level); - else - res = (addr_pointed1 != addr_pointed2); - if (res == 1) - return res; + 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 = snapshot1.on_heap(addr_pointed1) && snapshot2.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 0; + return false; case DW_TAG_structure_type: case DW_TAG_class_type: @@ -744,34 +663,32 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons 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; + return false; for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) { - int res = compare_heap_area_with_type(state, (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; + 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; } } 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); - void* real_member2 = - simgrid::dwarf::resolve_member(real_area2, type, &member, (simgrid::mc::AddressSpace*)snapshot2); - int res = compare_heap_area_with_type(state, 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, &snapshot1); + void* real_member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &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 not heap_area_equal_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, - type->byte_size, check_ignore); + return heap_area_differ_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, + type->byte_size, check_ignore); + + default: + THROW_IMPOSSIBLE; } - return 0; } /** Infer the type of a part of the block from the type of the block @@ -785,7 +702,7 @@ static int compare_heap_area_with_type(simgrid::mc::StateComparator& state, cons * @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) + const simgrid::mc::Snapshot& snapshot) { // Beginning of the block, the infered variable type if the type of the block: @@ -811,7 +728,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); + 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; } @@ -834,13 +751,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, const void* area1, const void* area2, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, +static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2, + const simgrid::mc::Snapshot& snapshot1, const 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; @@ -859,10 +776,10 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar 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)); - const malloc_info* heapinfos2 = snapshot2->read(remote((const malloc_info**)heapinfo_address)); + 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; @@ -879,17 +796,17 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar // 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: @@ -926,7 +843,7 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar /* Free block */ if (match_pairs) state.match_equals(previous); - return 0; + return false; } if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { @@ -934,11 +851,11 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar // TODO, lookup variable type from block type as done for fragmented blocks - if (state.equals_to1_(block1, 0).valid_ && state.equals_to2_(block2, 0).valid_ && + if (state.equals_to_<1>(block1, 0).valid_ && state.equals_to_<2>(block2, 0).valid_ && 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 && @@ -946,18 +863,17 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar (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; @@ -965,14 +881,14 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar // Remember (basic) type inference. // The current data structure only allows us to do this for the whole block. if (type != nullptr && area1 == real_addr_block1) - state.types1_(block1, 0) = type; + state.types_<1>(block1, 0) = type; if (type != nullptr && area2 == real_addr_block2) - state.types2_(block2, 0) = type; + state.types_<2>(block2, 0) = type; if (size <= 0) { if (match_pairs) state.match_equals(previous); - return 0; + return false; } if (heapinfo1->busy_block.ignore > 0 @@ -994,32 +910,32 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar 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; } } // Check if the blocks are already matched together: - if (state.equals_to1_(block1, frag1).valid_ && state.equals_to2_(block2, frag2).valid_ && offset1 == offset2 && + if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ && offset1 == offset2 && 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_: @@ -1028,33 +944,33 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar // Remember (basic) type inference. // The current data structure only allows us to do this for the whole fragment_. if (type != nullptr && area1 == real_addr_frag1) - state.types1_(block1, frag1) = type; + state.types_<1>(block1, frag1) = type; if (type != nullptr && area2 == real_addr_frag2) - state.types2_(block2, frag2) = type; + state.types_<2>(block2, frag2) = type; // The type of the variable is already known: if (type) { new_type1 = new_type2 = type; } // Type inference from the block type. - else if (state.types1_(block1, frag1) != nullptr || state.types2_(block2, frag2) != nullptr) { + else if (state.types_<1>(block1, frag1) != nullptr || state.types_<2>(block2, frag2) != nullptr) { offset1 = (char*)area1 - (char*)real_addr_frag1; 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); - 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); - 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); - new_type2 = get_offset_type(real_addr_frag2, state.types2_(block2, frag2), offset2, size, snapshot2); + if (state.types_<1>(block1, frag1) != nullptr && state.types_<2>(block2, frag2) != nullptr) { + new_type1 = get_offset_type(real_addr_frag1, state.types_<1>(block1, frag1), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types_<2>(block2, frag2), offset1, size, snapshot2); + } else if (state.types_<1>(block1, frag1) != nullptr) { + new_type1 = get_offset_type(real_addr_frag1, state.types_<1>(block1, frag1), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types_<1>(block1, frag1), offset2, size, snapshot2); + } else if (state.types_<2>(block2, frag2) != nullptr) { + new_type1 = get_offset_type(real_addr_frag1, state.types_<2>(block2, frag2), offset1, size, snapshot1); + new_type2 = get_offset_type(real_addr_frag2, state.types_<2>(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) { @@ -1072,7 +988,7 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar } else { if (match_pairs) state.match_equals(previous); - return -1; + return false; } } @@ -1082,16 +998,16 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar } 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) && @@ -1099,24 +1015,19 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar 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, area1, area2, snapshot1, snapshot2, previous, type, size, - check_ignore, pointer_level); - else - res_compare = - not heap_area_equal_without_type(state, 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; } } @@ -1125,23 +1036,20 @@ static int compare_heap_area(simgrid::mc::StateComparator& state, const void* ar /************************** Snapshot comparison *******************************/ /******************************************************************************/ -static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* real_area1, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1, void* real_area2, - simgrid::mc::Snapshot* snapshot2, simgrid::mc::Region* region2, - simgrid::mc::Type* type, int pointer_level) +static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, + const simgrid::mc::Snapshot& snapshot1, simgrid::mc::Region* region1, + const void* real_area2, const 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; xbt_assert(type != nullptr); switch (type->type) { case DW_TAG_unspecified_type: - return 1; + return true; case DW_TAG_base_type: case DW_TAG_enumeration_type: @@ -1150,13 +1058,13 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re case DW_TAG_typedef: case DW_TAG_volatile_type: case DW_TAG_const_type: - return compare_areas_with_type(state, real_area1, snapshot1, region1, real_area2, snapshot2, region2, - type->subtype, pointer_level); + 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 1; + return true; case DW_TAG_base_type: case DW_TAG_enumeration_type: @@ -1179,30 +1087,29 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re elm_size = subsubtype->byte_size; break; default: - return 0; + return false; } for (i = 0; i < type->element_count; i++) { size_t off = i * elm_size; - res = compare_areas_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off, - snapshot2, region2, type->subtype, pointer_level); - if (res == 1) - return res; + 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: { - void* addr_pointed1 = MC_region_read_pointer(region1, real_area1); - void* addr_pointed2 = MC_region_read_pointer(region2, real_area2); + 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 0; + return false; if (addr_pointed1 == nullptr || addr_pointed2 == nullptr) - return 1; + return true; if (not state.compared_pointers.insert(std::make_pair(addr_pointed1, addr_pointed2)).second) - return 0; + return false; pointer_level++; @@ -1211,22 +1118,22 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re // * 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; + if (snapshot1.on_heap(addr_pointed1)) { + if (not snapshot2.on_heap(addr_pointed2)) + return true; // The pointers are both in the heap: - return simgrid::mc::compare_heap_area(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr, - type->subtype, pointer_level); + 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 1; + return true; if (not type->type_id) return (addr_pointed1 != addr_pointed2); else - return compare_areas_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2, - type->subtype, pointer_level); + 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 @@ -1238,33 +1145,32 @@ static int compare_areas_with_type(simgrid::mc::StateComparator& state, void* re 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 - res = compare_areas_with_type(state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, - member.type, pointer_level); - if (res == 1) - return res; + 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 -1; + return false; default: XBT_VERB("Unknown case: %d", type->type); break; } - return 0; + return false; } -static bool global_variables_equal(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) +static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::ObjectInformation* object_info, + simgrid::mc::Region* r1, simgrid::mc::Region* r2, + const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2) { xbt_assert(r1 && r2, "Missing region."); - std::vector& variables = object_info->global_variables; + const std::vector& variables = object_info->global_variables; for (simgrid::mc::Variable const& current_var : variables) { @@ -1276,75 +1182,64 @@ static bool global_variables_equal(simgrid::mc::StateComparator& state, simgrid: continue; simgrid::mc::Type* bvariable_type = current_var.type; - int res = compare_areas_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address, - snapshot2, r2, bvariable_type, 0); - if (res == 1) { - XBT_VERB("Global variable %s (%p) is different between snapshots", - current_var.name.c_str(), - (char *) current_var.address); - return false; + if (areas_differ_with_type(state, current_var.address, snapshot1, r1, current_var.address, snapshot2, r2, + bvariable_type, 0)) { + XBT_VERB("Global variable %s (%p) is different between snapshots", current_var.name.c_str(), current_var.address); + return true; } } - return true; + return false; } -static bool local_variables_equal(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1, - mc_snapshot_stack_t stack2) +static bool local_variables_differ(simgrid::mc::StateComparator& state, const simgrid::mc::Snapshot& snapshot1, + const simgrid::mc::Snapshot& snapshot2, const_mc_snapshot_stack_t stack1, + const_mc_snapshot_stack_t stack2) { if (stack1->local_variables.size() != stack2->local_variables.size()) { XBT_VERB("Different number of local variables"); - return false; + return true; } 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]; + const_local_variable_t current_var1 = &stack1->local_variables[cursor]; + const_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(), + 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 false; + return true; } - if (compare_areas_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) == 1) { - 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 false; - } + 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 true; + } + return false; } namespace simgrid { namespace mc { -static std::unique_ptr state_comparator; - -bool snapshot_equal(Snapshot* s1, Snapshot* s2) +bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) { // TODO, make this a field of ModelChecker or something similar - if (state_comparator == nullptr) - state_comparator.reset(new StateComparator()); - else - state_comparator->clear(); + static StateComparator state_comparator; - RemoteClient* process = &mc_model_checker->process(); + const RemoteClient& process = mc_model_checker->process(); 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; - } else - XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_); + } + 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_) { @@ -1364,23 +1259,23 @@ bool snapshot_equal(Snapshot* s1, Snapshot* s2) } /* 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::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()); - int res_init = state_comparator->initHeapInformation(heap1, heap2, &s1->to_ignore_, &s2->to_ignore_); - - if (res_init == -1) { + xbt_mheap_t heap1 = + static_cast(s1->read_bytes(alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + remote(process.heap_address), simgrid::mc::ReadOptions::lazy())); + xbt_mheap_t heap2 = + static_cast(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 */ 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]; + const_mc_snapshot_stack_t stack1 = &s1->stacks_[cursor]; + const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor]; - if (not local_variables_equal(*state_comparator, s1, s2, stack1, stack2)) { + 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; } @@ -1403,7 +1298,7 @@ bool snapshot_equal(Snapshot* s1, Snapshot* s2) xbt_assert(region1->object_info()); /* Compare global variables */ - if (not global_variables_equal(*state_comparator, region1->object_info(), region1, region2, s1, s2)) { + 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; @@ -1411,14 +1306,14 @@ bool snapshot_equal(Snapshot* s1, Snapshot* s2) } /* Compare heap */ - if (not mmalloc_heap_equal(*state_comparator, s1, s2)) { + if (mmalloc_heap_differ(state_comparator, *s1, *s2)) { XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_); return false; } - XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_); + XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_); - return true; + return true; } }