X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/178d93b55be5105559c7b8277838b44944e3ad8c..ecd057376de847d40e1e29e2bf33e95eae3f835f:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 6baf980d9d..849059b214 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2020. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2022. The SimGrid Team. All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it * under the terms of the license (GNU LGPL) which comes with this package. */ @@ -7,15 +7,13 @@ #include "src/mc/mc_config.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_smx.hpp" #include "src/mc/sosp/Snapshot.hpp" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); +#include -using simgrid::mc::remote; +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare in mc"); -namespace simgrid { -namespace mc { +namespace simgrid::mc { /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ @@ -38,8 +36,8 @@ public: } }; -typedef std::array HeapLocationPair; -typedef std::set HeapLocationPairs; +using HeapLocationPair = std::array; +using HeapLocationPairs = std::set; class HeapArea : public HeapLocation { public: @@ -126,50 +124,34 @@ public: void match_equals(const HeapLocationPairs* list); }; -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc /************************************************************************************/ static ssize_t heap_comparison_ignore_size(const std::vector* ignore_list, const void* address) { - int start = 0; - int end = ignore_list->size() - 1; - - while (start <= end) { - unsigned int cursor = (start + end) / 2; - simgrid::mc::IgnoredHeapRegion const& region = (*ignore_list)[cursor]; - if (region.address == address) - return region.size; - if (region.address < address) - start = cursor + 1; - if (region.address > address) - end = cursor - 1; - } - - return -1; + auto pos = std::lower_bound(ignore_list->begin(), ignore_list->end(), address, + [](auto const& reg, auto const* addr) { return reg.address < addr; }); + return (pos != ignore_list->end() && pos->address == address) ? pos->size : -1; } -static bool is_stack(const void *address) +static bool is_stack(const simgrid::mc::RemoteProcess& process, const void* address) { - for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas()) - if (address == stack.address) - return true; - return false; + auto const& stack_areas = process.stack_areas(); + return std::any_of(stack_areas.begin(), stack_areas.end(), + [address](auto const& stack) { return stack.address == address; }); } // TODO, this should depend on the snapshot? -static bool is_block_stack(int block) +static bool is_block_stack(const simgrid::mc::RemoteProcess& process, int block) { - for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas()) - if (block == stack.block) - return true; - return false; + auto const& stack_areas = process.stack_areas(); + return std::any_of(stack_areas.begin(), stack_areas.end(), + [block](auto const& stack) { return stack.block == block; }); } -namespace simgrid { -namespace mc { +namespace simgrid::mc { void StateComparator::match_equals(const HeapLocationPairs* list) { @@ -200,7 +182,7 @@ int StateComparator::initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize)) return -1; this->heaplimit = heap1->heaplimit; - this->std_heap_copy = *mc_model_checker->get_remote_simulation().get_heap(); + this->std_heap_copy = *mc_model_checker->get_remote_process().get_heap(); this->processStates[0].initHeapInformation(heap1, i1); this->processStates[1].initHeapInformation(heap2, i2); return 0; @@ -215,13 +197,44 @@ static inline Region* MC_get_heap_region(const Snapshot& snapshot) xbt_die("No heap region"); } -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 heap_area_differ(const RemoteProcess& process, 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(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2) +/* Compares the content of each heap fragment between the two states, at the bit level. + * + * This operation is costly (about 5 seconds per snapshots' pair to compare on a small program), + * but hard to optimize because our algorithm is too hackish. + * + * Going at bit level can trigger syntaxtic differences on states that are semantically equivalent. + * + * Padding bytes constitute the first source of such syntaxtic difference: Any malloced memory contains spaces that + * are not used to enforce the memory alignment constraints of the CPU. So, cruft of irrelevant changes could get + * added on these bits. But this case is handled properly, as any memory block is zeroed by mmalloc before being handled + * back, not only for calloc but also for malloc. So the memory interstices due to padding bytes are properly zeroed. + * + * Another source of such change comes from the order of mallocs, that may well change from one execution path to + * another. This will change the malloc fragment in which the data is stored and the pointer values (syntaxtic + * difference) while the semantic of the state remains the same. + * + * To fix this, this code relies on a hugly hack. When we see a difference during the bit-level comparison, + * we first check if it could be explained by a pointer-to-block difference. Ie, if when interpreting the memory + * area containing that difference as a pointer, I get the pointer to a valid fragment in the heap (in both snapshots). + * + * This is why we cannot pre-compute a bit-level hash of the heap content: we discover the pointers to other memory + * fragment when a difference is found during the bit-level exploration. Fixing this would require to save typing + * information about the memory fragments, which is something that could be done with https://github.com/tudasc/TypeART + * This would give us all pointers in the mallocated memory, allowing the graph traversal needed to precompute the hash. + * + * Using a hash without paying attention to malloc fragment reordering would lead to false negatives: + * semantically equivalent states would be detected as [syntaxically] different. It's of no importance for the + * state-equality reduction (we would re-explore semantically equivalent states), but it would endanger the soundness + * of the liveness model-checker, as state-equality is used to detect the loops that constitute the accepting states of + * the verified property. So we could miss counter-examples to the verified property. Not good. Not good at all. + */ +static bool mmalloc_heap_differ(const RemoteProcess& process, StateComparator& state, const Snapshot& snapshot1, + const Snapshot& snapshot2) { - const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); - /* Check busy blocks */ size_t i1 = 1; @@ -233,13 +246,11 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot const 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; + uint64_t heapinfo_address = process.heap_address.address() + offsetof(s_xbt_mheap_t, heapinfo); // This is in snapshot do not use them directly: - const malloc_info* heapinfos1 = - snapshot1.read(RemotePtr((std::uint64_t)heapinfo_address)); - const malloc_info* heapinfos2 = - snapshot2.read(RemotePtr((std::uint64_t)heapinfo_address)); + const malloc_info* heapinfos1 = snapshot1.read(remote(heapinfo_address)); + const malloc_info* heapinfos2 = snapshot2.read(remote(heapinfo_address)); while (i1 < state.heaplimit) { const auto* heapinfo1 = @@ -254,10 +265,10 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot xbt_assert(heapinfo1->type >= 0, "Unknown mmalloc block type: %d", heapinfo1->type); - void* addr_block1 = ((void*)(((ADDR2UINT(i1)) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase)); + void* addr_block1 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ - if (is_stack(addr_block1)) { + if (is_stack(process, addr_block1)) { for (size_t k = 0; k < heapinfo1->busy_block.size; k++) state.equals_to_<1>(i1 + k, 0) = HeapArea(i1, -1); for (size_t k = 0; k < heapinfo2->busy_block.size; k++) @@ -277,7 +288,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot /* Try first to associate to same block in the other heap */ if (heapinfo2->type == heapinfo1->type && state.equals_to_<2>(i1, 0).valid_ == 0) { const void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; - if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { + if (not heap_area_differ(process, state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { for (size_t k = 1; k < heapinfo2->busy_block.size; k++) state.equals_to_<2>(i1 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) @@ -308,7 +319,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot continue; } - if (not heap_area_differ(state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { + if (not heap_area_differ(process, state, addr_block1, addr_block2, snapshot1, snapshot2, nullptr, nullptr, 0)) { for (size_t k = 1; k < heapinfo2b->busy_block.size; k++) state.equals_to_<2>(i2 + k, 0) = HeapArea(i1, -1); for (size_t k = 1; k < heapinfo1->busy_block.size; k++) @@ -340,7 +351,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot if (heapinfo2->type == heapinfo1->type && not state.equals_to_<2>(i1, j1).valid_) { const void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; const void* addr_frag2 = (const char*)addr_block2 + (j1 << heapinfo2->type); - if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) + if (not heap_area_differ(process, state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) equal = true; } @@ -371,7 +382,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot const void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; const void* addr_frag2 = (const char*)addr_block2 + (j2 << heapinfo2b->type); - if (not heap_area_differ(state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, 0)) { + if (not heap_area_differ(process, state, addr_frag1, addr_frag2, snapshot1, snapshot2, nullptr, nullptr, + 0)) { equal = true; break; } @@ -444,11 +456,10 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot * @param check_ignore * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_differ_without_type(StateComparator& state, const void* real_area1, const void* real_area2, - const Snapshot& snapshot1, const Snapshot& snapshot2, +static bool heap_area_differ_without_type(const RemoteProcess& process, StateComparator& state, const void* real_area1, + const void* real_area2, const Snapshot& snapshot1, const Snapshot& snapshot2, HeapLocationPairs* previous, int size, int check_ignore) { - const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); const Region* heap_region1 = MC_get_heap_region(snapshot1); const Region* heap_region2 = MC_get_heap_region(snapshot2); @@ -482,7 +493,7 @@ static bool heap_area_differ_without_type(StateComparator& state, const void* re if (snapshot1.on_heap(addr_pointed1) && snapshot2.on_heap(addr_pointed2)) { // Both addresses are in the heap: - if (heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0)) + if (heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, nullptr, 0)) return true; i = pointer_align + sizeof(void *); continue; @@ -508,10 +519,10 @@ static bool heap_area_differ_without_type(StateComparator& state, const void* re * @param pointer_level * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_differ_with_type(StateComparator& state, const void* real_area1, const void* real_area2, - const Snapshot& snapshot1, const Snapshot& snapshot2, - HeapLocationPairs* previous, const Type* type, int area_size, int check_ignore, - int pointer_level) +static bool heap_area_differ_with_type(const simgrid::mc::RemoteProcess& process, StateComparator& state, + const void* real_area1, const void* real_area2, const Snapshot& snapshot1, + const Snapshot& snapshot2, HeapLocationPairs* previous, const Type* type, + int area_size, int check_ignore, int pointer_level) { // HACK: This should not happen but in practice, there are some // DW_TAG_typedef without an associated DW_AT_type: @@ -522,7 +533,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ if (type == nullptr) return false; - if (is_stack(real_area1) && is_stack(real_area2)) + if (is_stack(process, real_area1) && is_stack(process, real_area2)) return false; if (check_ignore > 0) { @@ -565,8 +576,8 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ 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); + return heap_area_differ_with_type(process, state, real_area1, real_area2, snapshot1, snapshot2, previous, + type->subtype, area_size, check_ignore, pointer_level); case DW_TAG_array_type: subtype = type->subtype; @@ -600,7 +611,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ } 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), + if (heap_area_differ_with_type(process, 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; @@ -620,8 +631,8 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ 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); + return heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, previous, + type->subtype, pointer_level); else return (addr_pointed1 != addr_pointed2); } @@ -629,9 +640,9 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ 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; + ? heap_area_differ(process, state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, + previous, type->subtype, pointer_level) + : addr_pointed1 != addr_pointed2; if (differ) return true; } @@ -647,7 +658,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ 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, + if (heap_area_differ_with_type(process, 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; @@ -657,7 +668,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ // TODO, optimize this? (for the offset case) const void* real_member1 = dwarf::resolve_member(real_area1, type, &member, &snapshot1); const void* real_member2 = dwarf::resolve_member(real_area2, type, &member, &snapshot2); - if (heap_area_differ_with_type(state, real_member1, real_member2, snapshot1, snapshot2, previous, + if (heap_area_differ_with_type(process, state, real_member1, real_member2, snapshot1, snapshot2, previous, member.type, -1, check_ignore, 0)) return true; } @@ -665,7 +676,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ return false; case DW_TAG_union_type: - return heap_area_differ_without_type(state, real_area1, real_area2, snapshot1, snapshot2, previous, + return heap_area_differ_without_type(process, state, real_area1, real_area2, snapshot1, snapshot2, previous, type->byte_size, check_ignore); default: @@ -731,11 +742,10 @@ static Type* get_offset_type(void* real_base_address, Type* type, int offset, in * @param pointer_level * @return true when different, false otherwise (same or unknown) */ -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 heap_area_differ(const RemoteProcess& process, StateComparator& state, const void* area1, const void* area2, + const Snapshot& snapshot1, const Snapshot& snapshot2, HeapLocationPairs* previous, + Type* type, int pointer_level) { - const simgrid::mc::RemoteSimulation& process = mc_model_checker->get_remote_simulation(); - ssize_t block1; ssize_t block2; ssize_t size; @@ -752,10 +762,10 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo 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; + uint64_t heapinfo_address = process.heap_address.address() + offsetof(s_xbt_mheap_t, 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(heapinfo_address)); + const malloc_info* heapinfos2 = snapshot2.read(remote(heapinfo_address)); malloc_info heapinfo_temp1; malloc_info heapinfo_temp2; @@ -771,7 +781,7 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo block2 = ((const char*)area2 - (const char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1; // If either block is a stack block: - if (is_block_stack((int) block1) && is_block_stack((int) block2)) { + if (is_block_stack(process, (int)block1) && is_block_stack(process, (int)block2)) { previous->insert(HeapLocationPair{{HeapLocation(block1, -1), HeapLocation(block2, -1)}}); if (match_pairs) state.match_equals(previous); @@ -836,7 +846,8 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo if (type_size != -1 && type_size != (ssize_t)heapinfo1->busy_block.busy_size && type_size != (ssize_t)heapinfo2->busy_block.busy_size && - (type->name.empty() || type->name == "struct s_smx_context")) { + (type->name.empty() || + type->name == "struct s_smx_context")) { // FIXME: there is no struct s_smx_context anymore if (match_pairs) state.match_equals(previous); return false; @@ -896,7 +907,7 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo } // Check if the blocks are already matched together: - if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ && offset1 == offset2 && + if (state.equals_to_<1>(block1, frag1).valid_ && state.equals_to_<2>(block2, frag2).valid_ && state.fragmentsEqual(block1, frag1, block2, frag2)) { if (match_pairs) state.match_equals(previous); @@ -991,27 +1002,26 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo return true; /* Start comparison */ - 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) + if (type ? heap_area_differ_with_type(process, state, area1, area2, snapshot1, snapshot2, previous, type, size, + check_ignore, pointer_level) + : heap_area_differ_without_type(process, state, area1, area2, snapshot1, snapshot2, previous, size, + check_ignore)) return true; if (match_pairs) state.match_equals(previous); return false; } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc /************************** Snapshot comparison *******************************/ /******************************************************************************/ -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, const simgrid::mc::Type* type, int pointer_level) +static bool areas_differ_with_type(const simgrid::mc::RemoteProcess& process, 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, + const simgrid::mc::Type* type, int pointer_level) { const simgrid::mc::Type* subtype; const simgrid::mc::Type* subsubtype; @@ -1029,7 +1039,7 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo 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, + return areas_differ_with_type(process, state, real_area1, snapshot1, region1, real_area2, snapshot2, region2, type->subtype, pointer_level); case DW_TAG_array_type: subtype = type->subtype; @@ -1062,7 +1072,7 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo } for (int i = 0; i < type->element_count; i++) { size_t off = i * elm_size; - if (areas_differ_with_type(state, (const char*)real_area1 + off, snapshot1, region1, + if (areas_differ_with_type(process, state, (const char*)real_area1 + off, snapshot1, region1, (const char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level)) return true; } @@ -1093,8 +1103,8 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo if (not snapshot2.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); + return simgrid::mc::heap_area_differ(process, 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: @@ -1103,8 +1113,8 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo 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); + return areas_differ_with_type(process, 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. @@ -1119,8 +1129,8 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo const 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)) + if (areas_differ_with_type(process, state, member1, snapshot1, subregion1, member2, snapshot2, subregion2, + member.type, pointer_level)) return true; } break; @@ -1134,7 +1144,7 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo return false; } -static bool global_variables_differ(simgrid::mc::StateComparator& state, +static bool global_variables_differ(const simgrid::mc::RemoteProcess& process, simgrid::mc::StateComparator& state, const simgrid::mc::ObjectInformation* object_info, simgrid::mc::Region* r1, simgrid::mc::Region* r2, const simgrid::mc::Snapshot& snapshot1, const simgrid::mc::Snapshot& snapshot2) @@ -1151,7 +1161,7 @@ static bool global_variables_differ(simgrid::mc::StateComparator& state, continue; const simgrid::mc::Type* bvariable_type = current_var.type; - if (areas_differ_with_type(state, current_var.address, snapshot1, r1, current_var.address, snapshot2, r2, + if (areas_differ_with_type(process, 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; @@ -1161,9 +1171,9 @@ static bool global_variables_differ(simgrid::mc::StateComparator& state, return false; } -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) +static bool local_variables_differ(const simgrid::mc::RemoteProcess& process, 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"); @@ -1182,9 +1192,9 @@ static bool local_variables_differ(simgrid::mc::StateComparator& state, const si return true; } - 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)) { + if (areas_differ_with_type(process, 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; @@ -1193,68 +1203,64 @@ static bool local_variables_differ(simgrid::mc::StateComparator& state, const si return false; } -namespace simgrid { -namespace mc { +namespace simgrid::mc { -bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) +bool Snapshot::operator==(const Snapshot& other) { // TODO, make this a field of ModelChecker or something similar static StateComparator state_comparator; - const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); + const RemoteProcess& process = mc_model_checker->get_remote_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_); + if (hash_ != other.hash_) { + XBT_VERB("(%ld - %ld) Different hash: 0x%" PRIx64 "--0x%" PRIx64, this->num_state_, other.num_state_, this->hash_, + other.hash_); return false; } - XBT_VERB("(%d - %d) Same hash: 0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_); + XBT_VERB("(%ld - %ld) Same hash: 0x%" PRIx64, this->num_state_, other.num_state_, this->hash_); - /* Compare enabled processes */ - if (s1->enabled_processes_ != s2->enabled_processes_) { - XBT_VERB("(%d - %d) Different amount of enabled processes", s1->num_state_, s2->num_state_); - return false; - } + /* TODO: re-enable the quick filter of counting enabled processes in each snapshots */ /* Compare size of stacks */ - 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 < this->stacks_.size(); i++) { + size_t size_used1 = this->stack_sizes_[i]; + size_t size_used2 = other.stack_sizes_[i]; if (size_used1 != size_used2) { - XBT_VERB("(%d - %d) Different size used in stacks: %zu - %zu", s1->num_state_, s2->num_state_, size_used1, + XBT_VERB("(%ld - %ld) Different size used in stacks: %zu - %zu", num_state_, other.num_state_, size_used1, size_used2); return false; } } /* Init heap information used in heap comparison algorithm */ - const s_xbt_mheap_t* heap1 = static_cast(s1->read_bytes( - alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), ReadOptions::lazy())); - const s_xbt_mheap_t* heap2 = static_cast(s2->read_bytes( - alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), remote(process.heap_address), 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_); + const s_xbt_mheap_t* heap1 = static_cast(this->read_bytes( + alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); + const s_xbt_mheap_t* heap2 = static_cast(other.read_bytes( + alloca(sizeof(s_xbt_mheap_t)), sizeof(s_xbt_mheap_t), process.heap_address, ReadOptions::lazy())); + if (state_comparator.initHeapInformation(heap1, heap2, this->to_ignore_, other.to_ignore_) == -1) { + XBT_VERB("(%ld - %ld) Different heap information", this->num_state_, other.num_state_); return false; } /* Stacks comparison */ - for (unsigned int cursor = 0; cursor < s1->stacks_.size(); cursor++) { - const_mc_snapshot_stack_t stack1 = &s1->stacks_[cursor]; - const_mc_snapshot_stack_t stack2 = &s2->stacks_[cursor]; + for (unsigned int cursor = 0; cursor < this->stacks_.size(); cursor++) { + const_mc_snapshot_stack_t stack1 = &this->stacks_[cursor]; + const_mc_snapshot_stack_t stack2 = &other.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); + if (local_variables_differ(process, state_comparator, *this, other, stack1, stack2)) { + XBT_VERB("(%ld - %ld) Different local variables between stacks %u", this->num_state_, other.num_state_, + cursor + 1); return false; } } - size_t regions_count = s1->snapshot_regions_.size(); - if (regions_count != s2->snapshot_regions_.size()) + size_t regions_count = this->snapshot_regions_.size(); + if (regions_count != other.snapshot_regions_.size()) return false; for (size_t k = 0; k != regions_count; ++k) { - Region* region1 = s1->snapshot_regions_[k].get(); - Region* region2 = s2->snapshot_regions_[k].get(); + Region* region1 = this->snapshot_regions_[k].get(); + Region* region2 = other.snapshot_regions_[k].get(); // Preconditions: if (region1->region_type() != RegionType::Data) @@ -1265,22 +1271,22 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) xbt_assert(region1->object_info()); /* Compare global variables */ - if (global_variables_differ(state_comparator, region1->object_info(), region1, region2, *s1, *s2)) { + if (global_variables_differ(process, state_comparator, region1->object_info(), region1, region2, *this, other)) { 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()); + XBT_VERB("(%ld - %ld) Different global variables in %s", this->num_state_, other.num_state_, name.c_str()); return false; } } + XBT_VERB(" Compare heap..."); /* Compare heap */ - if (mmalloc_heap_differ(state_comparator, *s1, *s2)) { - XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", s1->num_state_, s2->num_state_); + if (mmalloc_heap_differ(process, state_comparator, *this, other)) { + XBT_VERB("(%ld - %ld) Different heap (mmalloc_heap_differ)", this->num_state_, other.num_state_); return false; } - XBT_VERB("(%d - %d) No difference found", s1->num_state_, s2->num_state_); + XBT_VERB("(%ld - %ld) No difference found", this->num_state_, other.num_state_); return true; } -} // namespace mc -} // namespace simgrid +} // namespace simgrid::mc