X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/330c412486ad86896ffff897a620c2d253f32386..08b0cdde2e5309e92177559c194940ca363109e3:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index a93c6d1139..f97b59899d 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2021. 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,9 +7,10 @@ #include "src/mc/mc_config.hpp" #include "src/mc/mc_private.hpp" -#include "src/mc/mc_smx.hpp" #include "src/mc/sosp/Snapshot.hpp" +#include + XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); using simgrid::mc::remote; @@ -38,8 +39,8 @@ public: } }; -typedef std::array HeapLocationPair; -typedef std::set HeapLocationPairs; +using HeapLocationPair = std::array; +using HeapLocationPairs = std::set; class HeapArea : public HeapLocation { public: @@ -60,7 +61,7 @@ public: std::vector types; std::size_t heapsize = 0; - void initHeapInformation(xbt_mheap_t heap, const std::vector& i); + void initHeapInformation(const s_xbt_mheap_t* heap, const std::vector& i); }; class StateComparator { @@ -77,8 +78,8 @@ public: compared_pointers.clear(); } - int initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector& i1, - const std::vector& i2); + int initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2, + const std::vector& i1, const std::vector& i2); template HeapArea& equals_to_(std::size_t i, std::size_t j) { @@ -123,7 +124,7 @@ public: this->equals_to_<2>(b2, f2).block_ == b1 && this->equals_to_<2>(b2, f2).fragment_ == f1; } - void match_equals(HeapLocationPairs* list); + void match_equals(const HeapLocationPairs* list); }; } // namespace mc @@ -134,44 +135,30 @@ public: 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) { - for (auto const& stack : mc_model_checker->process().stack_areas()) - if (address == stack.address) - return true; - return false; + auto const& stack_areas = mc_model_checker->get_remote_simulation().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) { - for (auto const& stack : mc_model_checker->process().stack_areas()) - if (block == stack.block) - return true; - return false; + auto const& stack_areas = mc_model_checker->get_remote_simulation().stack_areas(); + return std::any_of(stack_areas.begin(), stack_areas.end(), + [block](auto const& stack) { return stack.block == block; }); } namespace simgrid { namespace mc { -void StateComparator::match_equals(HeapLocationPairs* list) +void StateComparator::match_equals(const HeapLocationPairs* list) { for (auto const& pair : *list) { if (pair[0].fragment_ != -1) { @@ -184,7 +171,7 @@ void StateComparator::match_equals(HeapLocationPairs* list) } } -void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::vector& i) +void ProcessComparisonState::initHeapInformation(const s_xbt_mheap_t* heap, const std::vector& i) { auto heaplimit = heap->heaplimit; this->heapsize = heap->heapsize; @@ -193,13 +180,14 @@ void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, const std::ve this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr); } -int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, const std::vector& i1, +int StateComparator::initHeapInformation(const s_xbt_mheap_t* heap1, const s_xbt_mheap_t* heap2, + const std::vector& i1, const std::vector& i2) { if ((heap1->heaplimit != heap2->heaplimit) || (heap1->heapsize != heap2->heapsize)) return -1; this->heaplimit = heap1->heaplimit; - this->std_heap_copy = *mc_model_checker->process().get_heap(); + this->std_heap_copy = *mc_model_checker->get_remote_simulation().get_heap(); this->processStates[0].initHeapInformation(heap1, i1); this->processStates[1].initHeapInformation(heap2, i2); return 0; @@ -219,7 +207,7 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2) { - const RemoteClient& process = mc_model_checker->process(); + const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); /* Check busy blocks */ size_t i1 = 1; @@ -228,8 +216,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot malloc_info heapinfo_temp2; malloc_info heapinfo_temp2b; - Region* heap_region1 = MC_get_heap_region(snapshot1); - Region* heap_region2 = MC_get_heap_region(snapshot2); + const Region* heap_region1 = MC_get_heap_region(snapshot1); + 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; @@ -241,17 +229,17 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot snapshot2.read(RemotePtr((std::uint64_t)heapinfo_address)); while (i1 < state.heaplimit) { - 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)); + const auto* heapinfo1 = + static_cast(heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info))); + const auto* heapinfo2 = + static_cast(heap_region2->read(&heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info))); if (heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ i1 ++; continue; } - xbt_assert(heapinfo1->type >= 0, "Unkown mmalloc block type: %d", heapinfo1->type); + 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)); @@ -294,8 +282,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot continue; } - const malloc_info* heapinfo2b = - (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); + const auto* heapinfo2b = + static_cast(heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info))); if (heapinfo2b->type != MMALLOC_TYPE_UNFRAGMENTED) { i2++; @@ -330,7 +318,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot if (state.equals_to_<1>(i1, j1).valid_) continue; - void* addr_frag1 = (void*)((char*)addr_block1 + (j1 << heapinfo1->type)); + void* addr_frag1 = (char*)addr_block1 + (j1 << heapinfo1->type); size_t i2 = 1; bool equal = false; @@ -344,8 +332,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot } while (i2 < state.heaplimit && not equal) { - const malloc_info* heapinfo2b = - (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); + const auto* heapinfo2b = + static_cast(heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info))); if (heapinfo2b->type == MMALLOC_TYPE_FREE || heapinfo2b->type == MMALLOC_TYPE_HEAPINFO) { i2 ++; @@ -358,7 +346,7 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot continue; } - xbt_assert(heapinfo2b->type >= 0, "Unkown mmalloc block type: %d", heapinfo2b->type); + xbt_assert(heapinfo2b->type >= 0, "Unknown mmalloc block type: %d", heapinfo2b->type); for (size_t j2 = 0; j2 < (size_t)(BLOCKSIZE >> heapinfo2b->type); j2++) { if (i2 == i1 && j2 == j1) @@ -390,8 +378,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot /* 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*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); + const auto* heapinfo1 = + static_cast(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_to_<1>(i, 0).valid_) { @@ -409,8 +397,8 @@ static bool mmalloc_heap_differ(StateComparator& state, const Snapshot& snapshot } for (size_t i = 1; i < state.heaplimit; i++) { - const malloc_info* heapinfo2 = - (const malloc_info*)heap_region2->read(&heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); + const auto* heapinfo2 = + static_cast(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_to_<2>(i, 0).valid_) { XBT_DEBUG("Block %zu not found (size used = %zu)", i, @@ -447,9 +435,9 @@ static bool heap_area_differ_without_type(StateComparator& state, const void* re const Snapshot& snapshot1, const Snapshot& snapshot2, HeapLocationPairs* previous, int size, int check_ignore) { - const RemoteClient& process = mc_model_checker->process(); - Region* heap_region1 = MC_get_heap_region(snapshot1); - Region* heap_region2 = MC_get_heap_region(snapshot2); + 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); for (int i = 0; i < size; ) { if (check_ignore > 0) { @@ -509,7 +497,7 @@ static bool heap_area_differ_without_type(StateComparator& state, const void* re */ 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, Type* type, int area_size, int check_ignore, + 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 @@ -536,8 +524,8 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ const void* addr_pointed1; const void* addr_pointed2; - Region* heap_region1 = MC_get_heap_region(snapshot1); - Region* heap_region2 = MC_get_heap_region(snapshot2); + const Region* heap_region1 = MC_get_heap_region(snapshot1); + const Region* heap_region2 = MC_get_heap_region(snapshot2); switch (type->type) { case DW_TAG_unspecified_type: @@ -652,7 +640,7 @@ static bool heap_area_differ_with_type(StateComparator& state, const void* real_ return true; } } else { - for (simgrid::mc::Member& member : type->members) { + for (const simgrid::mc::Member& member : type->members) { // 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); @@ -700,7 +688,7 @@ static Type* get_offset_type(void* real_base_address, Type* type, int offset, in return nullptr; } - for (simgrid::mc::Member& member : type->members) { + for (const simgrid::mc::Member& member : type->members) { if (member.has_offset_location()) { // We have the offset, use it directly (shortcut): if (member.offset() == offset) @@ -733,7 +721,7 @@ static Type* get_offset_type(void* real_base_address, Type* type, int offset, in 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) { - const simgrid::mc::RemoteClient& process = mc_model_checker->process(); + const simgrid::mc::RemoteSimulation& process = mc_model_checker->get_remote_simulation(); ssize_t block1; ssize_t block2; @@ -747,7 +735,6 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo int new_size2 = -1; Type* new_type1 = nullptr; - Type* new_type2 = nullptr; bool match_pairs = false; @@ -806,13 +793,13 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo type_size = type->byte_size; } - simgrid::mc::Region* heap_region1 = MC_get_heap_region(snapshot1); - simgrid::mc::Region* heap_region2 = MC_get_heap_region(snapshot2); + const Region* heap_region1 = MC_get_heap_region(snapshot1); + const Region* heap_region2 = MC_get_heap_region(snapshot2); - 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)); + const auto* heapinfo1 = + static_cast(heap_region1->read(&heapinfo_temp1, &heapinfos1[block1], sizeof(malloc_info))); + const auto* heapinfo2 = + static_cast(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)) { @@ -872,12 +859,12 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo } else if ((heapinfo1->type > 0) && (heapinfo2->type > 0)) { /* Fragmented block */ // Fragment number: - ssize_t frag1 = ((uintptr_t)(ADDR2UINT(area1) % (BLOCKSIZE))) >> heapinfo1->type; - ssize_t frag2 = ((uintptr_t)(ADDR2UINT(area2) % (BLOCKSIZE))) >> heapinfo2->type; + ssize_t frag1 = (ADDR2UINT(area1) % BLOCKSIZE) >> heapinfo1->type; + ssize_t frag2 = (ADDR2UINT(area2) % BLOCKSIZE) >> heapinfo2->type; // Process address of the fragment_: - void* real_addr_frag1 = (void*)((char*)real_addr_block1 + (frag1 << heapinfo1->type)); - void* real_addr_frag2 = (void*)((char*)real_addr_block2 + (frag2 << heapinfo2->type)); + void* real_addr_frag1 = (char*)real_addr_block1 + (frag1 << heapinfo1->type); + void* real_addr_frag2 = (char*)real_addr_block2 + (frag2 << heapinfo2->type); // Check the size of the fragments against the size of the type: if (type_size != -1) { @@ -924,10 +911,12 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo // The type of the variable is already known: if (type) { - new_type1 = new_type2 = type; + new_type1 = type; } // Type inference from the block type. else if (state.types_<1>(block1, frag1) != nullptr || state.types_<2>(block2, frag2) != nullptr) { + Type* new_type2 = nullptr; + offset1 = (const char*)area1 - (const char*)real_addr_frag1; offset2 = (const char*)area2 - (const char*)real_addr_frag2; @@ -1009,12 +998,11 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo 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::Region* region2, const simgrid::mc::Type* type, int pointer_level) { const simgrid::mc::Type* subtype; const simgrid::mc::Type* subsubtype; int elm_size; - int i; xbt_assert(type != nullptr); switch (type->type) { @@ -1059,7 +1047,7 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo default: return false; } - for (i = 0; i < type->element_count; i++) { + 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, (const char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level)) @@ -1113,7 +1101,7 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo } case DW_TAG_structure_type: case DW_TAG_class_type: - for (simgrid::mc::Member& member : type->members) { + for (const simgrid::mc::Member& member : type->members) { const void* member1 = simgrid::dwarf::resolve_member(real_area1, type, &member, &snapshot1); const void* member2 = simgrid::dwarf::resolve_member(real_area2, type, &member, &snapshot2); simgrid::mc::Region* subregion1 = snapshot1.get_region(member1, region1); // region1 is hinted @@ -1133,9 +1121,10 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo return false; } -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) +static bool global_variables_differ(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) { xbt_assert(r1 && r2, "Missing region."); @@ -1145,11 +1134,10 @@ static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid // If the variable is not in this object, skip it: // We do not expect to find a pointer to something which is not reachable // by the global variables. - if ((char *) current_var.address < (char *) object_info->start_rw - || (char *) current_var.address > (char *) object_info->end_rw) + if ((char*)current_var.address < object_info->start_rw || (char*)current_var.address > object_info->end_rw) continue; - simgrid::mc::Type* bvariable_type = current_var.type; + 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, bvariable_type, 0)) { XBT_VERB("Global variable %s (%p) is different between snapshots", current_var.name.c_str(), current_var.address); @@ -1200,7 +1188,7 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) // TODO, make this a field of ModelChecker or something similar static StateComparator state_comparator; - const RemoteClient& process = mc_model_checker->process(); + const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); if (s1->hash_ != s2->hash_) { XBT_VERB("(%d - %d) Different hash: 0x%" PRIx64 "--0x%" PRIx64, s1->num_state_, s2->num_state_, s1->hash_, @@ -1227,10 +1215,10 @@ bool snapshot_equal(const Snapshot* s1, const Snapshot* s2) } /* Init heap information used in heap comparison algorithm */ - 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())); - 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())); + 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_); return false;