X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ac9197eec3a25524040ce2f55021ba590788c3a3..21822b9cfb88284c4d8d7cace7ac74a7356612ec:/src/mc/compare.cpp diff --git a/src/mc/compare.cpp b/src/mc/compare.cpp index 9e93e1a58d..d72827bdc9 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-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. */ @@ -10,6 +10,8 @@ #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 +40,8 @@ public: } }; -typedef std::array HeapLocationPair; -typedef std::set HeapLocationPairs; +using HeapLocationPair = std::array; +using HeapLocationPairs = std::set; class HeapArea : public HeapLocation { public: @@ -134,26 +136,14 @@ 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, const void* address) { return reg.address < address; }); + 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()) + for (auto const& stack : mc_model_checker->get_remote_simulation().stack_areas()) if (address == stack.address) return true; return false; @@ -162,7 +152,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; @@ -200,7 +190,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->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; @@ -220,7 +210,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; @@ -242,17 +232,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)); @@ -295,8 +285,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++; @@ -331,7 +321,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; @@ -345,8 +335,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 ++; @@ -359,7 +349,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) @@ -391,8 +381,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_) { @@ -410,8 +400,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, @@ -448,7 +438,7 @@ 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(); + 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); @@ -734,7 +724,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; @@ -748,7 +738,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; @@ -810,10 +799,10 @@ static bool heap_area_differ(StateComparator& state, const void* area1, const vo 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)) { @@ -873,12 +862,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) { @@ -925,10 +914,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; @@ -1015,7 +1006,6 @@ static bool areas_differ_with_type(simgrid::mc::StateComparator& state, const vo const simgrid::mc::Type* subtype; const simgrid::mc::Type* subsubtype; int elm_size; - int i; xbt_assert(type != nullptr); switch (type->type) { @@ -1060,7 +1050,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)) @@ -1147,11 +1137,10 @@ static bool global_variables_differ(simgrid::mc::StateComparator& state, // 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); @@ -1202,7 +1191,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_, @@ -1229,10 +1218,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;