X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/e8923694f970d70ced0a96633f8a9034ca77a88e..b9625f82f86db0674e911887addce45dca31b57f:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index ab43da1bab..70c2982251 100644 --- a/src/mc/compare.cpp +++ b/src/mc/compare.cpp @@ -1,9 +1,9 @@ -/* Copyright (c) 2008-2019. The SimGrid Team. All rights reserved. */ +/* Copyright (c) 2008-2020. 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. */ -/** \file compare.cpp Memory snapshooting and comparison */ +/** \file compare.cpp Memory snapshotting and comparison */ #include "src/mc/mc_config.hpp" #include "src/mc/mc_private.hpp" @@ -26,7 +26,7 @@ public: int fragment_ = 0; HeapLocation() = default; - HeapLocation(int block, int fragment = 0) : block_(block), fragment_(fragment) {} + explicit HeapLocation(int block, int fragment = 0) : block_(block), fragment_(fragment) {} bool operator==(HeapLocation const& that) const { @@ -41,15 +41,6 @@ public: typedef std::array HeapLocationPair; typedef std::set HeapLocationPairs; -struct ProcessComparisonState; -struct StateComparator; - -static inline -HeapLocationPair makeHeapLocationPair(int block1, int fragment1, int block2, int fragment2) -{ - return HeapLocationPair{{HeapLocation(block1, fragment1), HeapLocation(block2, fragment2)}}; -} - class HeapArea : public HeapLocation { public: bool valid_ = false; @@ -64,17 +55,14 @@ public: class ProcessComparisonState { public: - std::vector* to_ignore = nullptr; + const std::vector* to_ignore = nullptr; std::vector equals_to; - std::vector types; + std::vector types; std::size_t heapsize = 0; - void initHeapInformation(xbt_mheap_t heap, std::vector* i); + void initHeapInformation(const s_xbt_mheap_t* heap, const std::vector& i); }; -static bool heap_area_differ(StateComparator& state, const void* area1, const void* area2, Snapshot* snapshot1, - Snapshot* snapshot2, HeapLocationPairs* previous, Type* type, int pointer_level); - class StateComparator { public: s_xbt_mheap_t std_heap_copy; @@ -89,43 +77,25 @@ public: compared_pointers.clear(); } - int initHeapInformation( - xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - 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); - 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 + template HeapArea const& equals_to_(std::size_t i, std::size_t j) const { - return processStates[1].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + return processStates[rank - 1].equals_to[MAX_FRAGMENT_PER_BLOCK * i + j]; } - Type* const& types1_(std::size_t i, std::size_t j) const + template Type* const& types_(std::size_t i, std::size_t j) const { - return processStates[0].types[ MAX_FRAGMENT_PER_BLOCK * i + j]; - } - Type* const& types2_(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 @@ -136,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 @@ -149,21 +119,20 @@ 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); + void match_equals(const HeapLocationPairs* list); }; -} -} +} // namespace mc +} // namespace simgrid /************************************************************************************/ -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; @@ -182,15 +151,9 @@ static ssize_t heap_comparison_ignore_size( return -1; } -static bool is_on_heap(const void* address) -{ - const xbt_mheap_t heap = mc_model_checker->process().get_heap(); - return address >= heap->heapbase && address < heap->breakval; -} - static bool is_stack(const void *address) { - for (auto const& stack : mc_model_checker->process().stack_areas()) + for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas()) if (address == stack.address) return true; return false; @@ -199,7 +162,7 @@ static bool is_stack(const void *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()) + for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas()) if (block == stack.block) return true; return false; @@ -208,55 +171,56 @@ static bool is_block_stack(int 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) { - 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_) = HeapArea(pair[1].block_, pair[1].fragment_); + this->equals_to_<2>(pair[1].block_, pair[1].fragment_) = 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) = HeapArea(pair[1].block_, pair[1].fragment_); + this->equals_to_<2>(pair[1].block_, 0) = HeapArea(pair[0].block_, pair[0].fragment_); } } } -void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, - std::vector* i) +void ProcessComparisonState::initHeapInformation(const s_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) +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; } // 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_) - if (region->region_type() == simgrid::mc::RegionType::Heap) + for (auto const& region : snapshot.snapshot_regions_) + if (region->region_type() == RegionType::Heap) return region.get(); xbt_die("No heap region"); } -static bool mmalloc_heap_differ(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(StateComparator& state, const Snapshot& snapshot1, const Snapshot& snapshot2) { - simgrid::mc::RemoteClient* process = &mc_model_checker->process(); + const RemoteSimulation& process = mc_model_checker->get_remote_simulation(); /* Check busy blocks */ size_t i1 = 1; @@ -265,20 +229,19 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc malloc_info heapinfo_temp2; malloc_info heapinfo_temp2b; - 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); // 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) { - const malloc_info* heapinfo1 = (const malloc_info*)heap_region1->read(&heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)); const malloc_info* heapinfo2 = @@ -289,25 +252,21 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc continue; } - if (heapinfo1->type < 0) { - fprintf(stderr, "Unkown mmalloc block type.\n"); - abort(); - } + 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)); - if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ - + if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ 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; } @@ -316,21 +275,20 @@ static bool mmalloc_heap_differ(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) { - void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + 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)) { 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; } } while (i2 < state.heaplimit && not equal) { - - void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; + const void* addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; if (i2 == i1) { i2++; @@ -345,20 +303,19 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc continue; } - if (state.equals_to2_(i2, 0).valid_) { + if (state.equals_to_<2>(i2, 0).valid_) { i2++; continue; } 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; } - i2++; } @@ -366,15 +323,12 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc XBT_DEBUG("Block %zu not found (size_used = %zu, addr = %p)", i1, heapinfo1->busy_block.busy_size, addr_block1); return true; } - - } else { /* Fragmented block */ - + } else { /* Fragmented block */ for (size_t j1 = 0; j1 < (size_t)(BLOCKSIZE >> heapinfo1->type); j1++) { - 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)); @@ -383,15 +337,14 @@ static bool mmalloc_heap_differ(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_) { - void* addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + (char*)state.std_heap_copy.heapbase; - void* addr_frag2 = (void*)((char*)addr_block2 + (j1 << heapinfo2->type)); + 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)) equal = true; } while (i2 < state.heaplimit && not equal) { - const malloc_info* heapinfo2b = (const malloc_info*)heap_region2->read(&heapinfo_temp2b, &heapinfos2[i2], sizeof(malloc_info)); @@ -406,28 +359,23 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc continue; } - if (heapinfo2b->type < 0) { - fprintf(stderr, "Unknown mmalloc block type.\n"); - abort(); - } + 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) 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)); + 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)) { equal = true; break; } } - i2++; } @@ -437,7 +385,6 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc return true; } } - i1++; } } @@ -448,7 +395,7 @@ static bool mmalloc_heap_differ(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 true; } @@ -456,7 +403,7 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc 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 true; } @@ -466,7 +413,7 @@ static bool mmalloc_heap_differ(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 true; @@ -476,13 +423,12 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc 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 true; } } - return false; } @@ -498,24 +444,21 @@ static bool mmalloc_heap_differ(simgrid::mc::StateComparator& state, simgrid::mc * @param check_ignore * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, const void* real_area1, - const void* real_area2, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, int size, - int check_ignore) +static bool heap_area_differ_without_type(StateComparator& state, const void* real_area1, const void* real_area2, + const Snapshot& snapshot1, const Snapshot& snapshot2, + HeapLocationPairs* previous, int size, int check_ignore) { - 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); + 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) { 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, (const char*)real_area2 + i); if (ignore2 == ignore1) { if (ignore1 == 0) { - check_ignore--; return false; } else { i = i + ignore2; @@ -528,31 +471,26 @@ static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, c 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**)((const char*)real_area1 + pointer_align))); - const void* addr_pointed2 = snapshot2->read(remote((void**)((const char*)real_area2 + pointer_align))); + const void* addr_pointed1 = snapshot1.read(remote((void* const*)((const char*)real_area1 + pointer_align))); + const void* addr_pointed2 = snapshot2.read(remote((void* const*)((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 (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) { + 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)) return true; i = pointer_align + sizeof(void *); continue; } - return true; } - i++; } - return false; } @@ -570,12 +508,12 @@ static bool heap_area_differ_without_type(simgrid::mc::StateComparator& state, c * @param pointer_level * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, - const void* real_area2, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, HeapLocationPairs* previous, - simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) +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) { - // HACK: This should not happen but in pratice, there are some + // HACK: This should not happen but in practice, there are some // DW_TAG_typedef without an associated DW_AT_type: //<1><538832>: Abbrev Number: 111 (DW_TAG_typedef) // <538833> DW_AT_name : (indirect string, offset: 0x2292f3): gregset_t @@ -593,14 +531,14 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons return false; } - simgrid::mc::Type* subtype; - simgrid::mc::Type* subsubtype; + const Type* subtype; + const Type* subsubtype; int elm_size; const void* addr_pointed1; const void* addr_pointed2; - 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); switch (type->type) { case DW_TAG_unspecified_type: @@ -673,24 +611,24 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons case DW_TAG_rvalue_reference_type: case DW_TAG_pointer_type: if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { - addr_pointed1 = snapshot1->read(remote((void* const*)real_area1)); - addr_pointed2 = snapshot2->read(remote((void* const*)real_area2)); + addr_pointed1 = snapshot1.read(remote((void* const*)real_area1)); + addr_pointed2 = snapshot2.read(remote((void* const*)real_area2)); return (addr_pointed1 != addr_pointed2); } pointer_level++; if (pointer_level <= 1) { - addr_pointed1 = snapshot1->read(remote((void* const*)real_area1)); - addr_pointed2 = snapshot2->read(remote((void* const*)real_area2)); - if (is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2)) + 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* const*)((const char*)real_area1 + i * sizeof(void*)))); - addr_pointed2 = snapshot2->read(remote((void* const*)((const char*)real_area2 + i * sizeof(void*)))); - bool differ = is_on_heap(addr_pointed1) && is_on_heap(addr_pointed2) + 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; @@ -703,6 +641,8 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons case DW_TAG_class_type: if (type->full_type) type = type->full_type; + if (type->byte_size == 0) + return false; if (area_size != -1 && type->byte_size != area_size) { if (area_size <= type->byte_size || area_size % type->byte_size != 0) return false; @@ -713,12 +653,10 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons 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) - 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); + 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, member.type, -1, check_ignore, 0)) return true; @@ -731,10 +669,8 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons type->byte_size, check_ignore); default: - XBT_VERB("Unknown case: %d", type->type); - break; + THROW_IMPOSSIBLE; } - return false; } /** Infer the type of a part of the block from the type of the block @@ -747,16 +683,13 @@ static bool heap_area_differ_with_type(simgrid::mc::StateComparator& state, cons * @param area_size * @return DWARF type ID for given offset */ -static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc::Type* type, int offset, int area_size, - simgrid::mc::Snapshot* snapshot) +static Type* get_offset_type(void* real_base_address, Type* type, int offset, int area_size, const Snapshot& snapshot) { - - // Beginning of the block, the infered variable type if the type of the block: + // Beginning of the block, the inferred variable type if the type of the block: if (offset == 0) return type; switch (type->type) { - case DW_TAG_structure_type: case DW_TAG_class_type: if (type->full_type) @@ -768,13 +701,13 @@ static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc:: 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) return member.type; } else { - void* real_member = simgrid::dwarf::resolve_member(real_base_address, type, &member, snapshot); + void* real_member = dwarf::resolve_member(real_base_address, type, &member, &snapshot); if ((char*)real_member - (char*)real_base_address == offset) return member.type; } @@ -784,7 +717,6 @@ static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc:: default: /* FIXME: other cases ? */ return nullptr; - } } @@ -799,11 +731,10 @@ static simgrid::mc::Type* get_offset_type(void* real_base_address, simgrid::mc:: * @param pointer_level * @return true when different, false otherwise (same or unknown) */ -static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* area1, const void* area2, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2, - HeapLocationPairs* previous, simgrid::mc::Type* type, int pointer_level) +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) { - 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; @@ -816,16 +747,16 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar int new_size1 = -1; int new_size2 = -1; - simgrid::mc::Type* new_type1 = nullptr; - simgrid::mc::Type* new_type2 = nullptr; + Type* new_type1 = nullptr; + Type* new_type2 = nullptr; 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; @@ -837,20 +768,21 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar } // Get block number: - block1 = ((char*)area1 - (char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1; - block2 = ((char*)area2 - (char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1; + block1 = ((const char*)area1 - (const char*)state.std_heap_copy.heapbase) / BLOCKSIZE + 1; + 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)) { - 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 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) || + if (((const char*)area1 < (const char*)state.std_heap_copy.heapbase) || + (block1 > (ssize_t)state.processStates[0].heapsize) || (block1 < 1) || + ((const char*)area2 < (const char*)state.std_heap_copy.heapbase) || (block2 > (ssize_t)state.processStates[1].heapsize) || (block2 < 1)) { return true; } @@ -873,11 +805,10 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar type_size = -1; else 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)); @@ -897,7 +828,7 @@ static bool heap_area_differ(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); @@ -916,7 +847,7 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar 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 false; @@ -927,9 +858,9 @@ static bool heap_area_differ(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) @@ -937,15 +868,13 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar return false; } - if (heapinfo1->busy_block.ignore > 0 - && heapinfo2->busy_block.ignore == heapinfo1->busy_block.ignore) + if (heapinfo1->busy_block.ignore > 0 && heapinfo2->busy_block.ignore == heapinfo1->busy_block.ignore) check_ignore = heapinfo1->busy_block.ignore; } 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)); @@ -968,7 +897,7 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar } // 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); @@ -990,29 +919,28 @@ static bool heap_area_differ(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) { - - 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); + else if (state.types_<1>(block1, frag1) != nullptr || state.types_<2>(block2, frag2) != nullptr) { + offset1 = (const char*)area1 - (const char*)real_addr_frag1; + offset2 = (const char*)area2 - (const char*)real_addr_frag2; + + 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); @@ -1020,7 +948,6 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar } if (new_type1 != nullptr && new_type2 != nullptr && new_type1 != new_type2) { - type = new_type1; while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; @@ -1044,7 +971,7 @@ static bool heap_area_differ(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 false; @@ -1059,7 +986,6 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar if ((heapinfo1->busy_frag.ignore[frag1] > 0) && (heapinfo2->busy_frag.ignore[frag2] == heapinfo1->busy_frag.ignore[frag1])) check_ignore = heapinfo1->busy_frag.ignore[frag1]; - } else return true; @@ -1075,20 +1001,19 @@ static bool heap_area_differ(simgrid::mc::StateComparator& state, const void* ar state.match_equals(previous); return false; } - -} -} +} // namespace mc +} // namespace simgrid /************************** Snapshot comparison *******************************/ /******************************************************************************/ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const void* real_area1, - simgrid::mc::Snapshot* snapshot1, simgrid::mc::Region* region1, - const void* real_area2, simgrid::mc::Snapshot* snapshot2, - simgrid::mc::Region* region2, simgrid::mc::Type* type, int pointer_level) + 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) { - simgrid::mc::Type* subtype; - simgrid::mc::Type* subsubtype; + const simgrid::mc::Type* subtype; + const simgrid::mc::Type* subsubtype; int elm_size; int i; @@ -1137,8 +1062,8 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo } for (i = 0; i < type->element_count; i++) { size_t off = i * elm_size; - if (areas_differ_with_type(state, (char*)real_area1 + off, snapshot1, region1, (char*)real_area2 + off, - snapshot2, region2, type->subtype, pointer_level)) + if (areas_differ_with_type(state, (const char*)real_area1 + off, snapshot1, region1, + (const char*)real_area2 + off, snapshot2, region2, type->subtype, pointer_level)) return true; } break; @@ -1164,8 +1089,8 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo // * a pointer leads to the read-only segment of the current object // * a pointer lead to a different ELF object - if (is_on_heap(addr_pointed1)) { - if (not is_on_heap(addr_pointed2)) + 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::heap_area_differ(state, addr_pointed1, addr_pointed2, snapshot1, snapshot2, nullptr, @@ -1181,7 +1106,6 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo return areas_differ_with_type(state, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2, type->subtype, pointer_level); } else { - // TODO, We do not handle very well the case where // it belongs to a different (non-heap) region from the current one. @@ -1190,11 +1114,11 @@ 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) { - 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 + 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 + 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; @@ -1210,29 +1134,26 @@ 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, simgrid::mc::Snapshot* snapshot1, - 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."); - std::vector& variables = object_info->global_variables; + const std::vector& variables = object_info->global_variables; for (simgrid::mc::Variable const& current_var : variables) { - // 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; - if (areas_differ_with_type(state, (char*)current_var.address, snapshot1, r1, (char*)current_var.address, snapshot2, - r2, bvariable_type, 0)) { - XBT_VERB("Global variable %s (%p) is different between snapshots", - current_var.name.c_str(), - (char *) current_var.address); + 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); return true; } } @@ -1240,9 +1161,9 @@ static bool global_variables_differ(simgrid::mc::StateComparator& state, simgrid return false; } -static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid::mc::Snapshot* snapshot1, - simgrid::mc::Snapshot* snapshot2, mc_snapshot_stack_t stack1, - mc_snapshot_stack_t stack2) +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"); @@ -1250,25 +1171,22 @@ static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid: } 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 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), + 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()); + 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; } } @@ -1278,17 +1196,12 @@ static bool local_variables_differ(simgrid::mc::StateComparator& state, simgrid: 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 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_, @@ -1315,21 +1228,21 @@ 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()); - if (state_comparator->initHeapInformation(heap1, heap2, &s1->to_ignore_, &s2->to_ignore_) == -1) { + 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; } /* 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 (local_variables_differ(*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; } @@ -1352,7 +1265,7 @@ bool snapshot_equal(Snapshot* s1, 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(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; @@ -1360,7 +1273,7 @@ bool snapshot_equal(Snapshot* s1, Snapshot* s2) } /* Compare heap */ - if (mmalloc_heap_differ(*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; } @@ -1369,6 +1282,5 @@ bool snapshot_equal(Snapshot* s1, Snapshot* s2) return true; } - -} -} +} // namespace mc +} // namespace simgrid