X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba012095972bdc4a8067424136dbcdeb011446d5..a6d6661d57c57d9a3e920002292970fab3a0231c:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index fc96ef0b82..d64c8f3fa9 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1,62 +1,137 @@ -/* mc_diff - Memory snapshooting and comparison */ - /* Copyright (c) 2008-2015. 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. */ -#include "xbt/ex_interface.h" /* internals of backtrace setup */ -#include "xbt/str.h" +/* mc_diff - Memory snapshooting and comparison */ + +#include +#include +#include + +#include "src/xbt/ex_interface.h" /* internals of backtrace setup */ #include "mc/mc.h" #include "xbt/mmalloc.h" -#include "mc_object_info.h" #include "mc/datatypes.h" -#include "mc/mc_private.h" -#include "mc/mc_snapshot.h" -#include "mc/Type.hpp" +#include "src/mc/malloc.hpp" +#include "src/mc/mc_private.h" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_dwarf.hpp" +#include "src/mc/Type.hpp" -using simgrid::mc::remote; +#include -extern "C" { +using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt, "Logging specific to mc_diff in mc"); -xbt_dynar_t mc_heap_comparison_ignore; -xbt_dynar_t stacks_areas; - /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ -typedef char *type_name; +namespace simgrid { +namespace mc { + +struct ProcessComparisonState { + std::vector* to_ignore = nullptr; + std::vector equals_to; + std::vector types; + std::size_t heapsize = 0; + + void initHeapInformation(xbt_mheap_t heap, + std::vector* i); +}; -struct XBT_PRIVATE s_mc_diff { +struct StateComparator { s_xbt_mheap_t std_heap_copy; - size_t heaplimit; - // Number of blocks in the heaps: - size_t heapsize1, heapsize2; - std::vector* to_ignore1; - std::vector* to_ignore2; - s_heap_area_t *equals_to1, *equals_to2; - simgrid::mc::Type **types1; - simgrid::mc::Type **types2; - size_t available; + std::size_t heaplimit; + std::array processStates; + + int initHeapInformation( + xbt_mheap_t heap1, xbt_mheap_t heap2, + std::vector* i1, + std::vector* i2); + + s_heap_area_t& equals_to1_(std::size_t i, std::size_t j) + { + return processStates[0].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + } + s_heap_area_t& equals_to2_(std::size_t i, std::size_t j) + { + return processStates[1].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + } + Type*& types1_(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]; + } + + s_heap_area_t const& equals_to1_(std::size_t i, std::size_t j) const + { + return processStates[0].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + } + s_heap_area_t const& equals_to2_(std::size_t i, std::size_t j) const + { + return processStates[1].equals_to[ MAX_FRAGMENT_PER_BLOCK * i + j]; + } + Type* const& types1_(std::size_t i, std::size_t j) const + { + 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]; + } + + /** Check whether two blocks are known to be matching + * + * @param state State used + * @param b1 Block of state 1 + * @param b2 Block of state 2 + * @return if the blocks are known to be matching + */ + bool blocksEqual(int b1, int b2) const + { + return this->equals_to1_(b1, 0).block == b2 + && this->equals_to2_(b2, 0).block == b1; + } + + /** Check whether two fragments are known to be matching + * + * @param state State used + * @param b1 Block of state 1 + * @param f1 Fragment of state 1 + * @param b2 Block of state 2 + * @param f2 Fragment of state 2 + * @return if the fragments are known to be matching + */ + 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; + } + + void match_equals(xbt_dynar_t list); }; -#define equals_to1_(i,j) equals_to1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] -#define equals_to2_(i,j) equals_to2[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] -#define types1_(i,j) types1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] -#define types2_(i,j) types2[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] +} +} -__thread struct s_mc_diff *mc_diff_info = NULL; +// TODO, make this a field of ModelChecker or something similar +static std::unique_ptr mc_diff_info; /*********************************** Free functions ************************************/ static void heap_area_pair_free(heap_area_pair_t pair) { xbt_free(pair); - pair = NULL; + pair = nullptr; } static void heap_area_pair_free_voidp(void *d) @@ -67,7 +142,7 @@ static void heap_area_pair_free_voidp(void *d) static void heap_area_free(heap_area_t area) { xbt_free(area); - area = NULL; + area = nullptr; } /************************************************************************************/ @@ -89,12 +164,11 @@ static int is_new_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, unsigned int cursor = 0; heap_area_pair_t current_pair; - xbt_dynar_foreach(list, cursor, current_pair) { + xbt_dynar_foreach(list, cursor, current_pair) if (current_pair->block1 == block1 && current_pair->block2 == block2 && current_pair->fragment1 == fragment1 && current_pair->fragment2 == fragment2) return 0; - } return 1; } @@ -103,31 +177,29 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, int block2, int fragment2) { - if (is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) { - heap_area_pair_t pair = NULL; - pair = xbt_new0(s_heap_area_pair_t, 1); - pair->block1 = block1; - pair->fragment1 = fragment1; - pair->block2 = block2; - pair->fragment2 = fragment2; - - xbt_dynar_push(list, &pair); - - return 1; - } + if (!is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) + return 0; - return 0; + heap_area_pair_t pair = nullptr; + pair = xbt_new0(s_heap_area_pair_t, 1); + pair->block1 = block1; + pair->fragment1 = fragment1; + pair->block2 = block2; + pair->fragment2 = fragment2; + xbt_dynar_push(list, &pair); + return 1; } -static ssize_t heap_comparison_ignore_size(std::vector* ignore_list, - const void *address) +static ssize_t heap_comparison_ignore_size( + 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; - s_mc_heap_ignore_region_t region = (*ignore_list)[cursor]; + simgrid::mc::IgnoredHeapRegion const& region = (*ignore_list)[cursor]; if (region.address == address) return region.size; if (region.address < address) @@ -139,166 +211,82 @@ static ssize_t heap_comparison_ignore_size(std::vectoraddress) - return 1; - } - - return 0; + for (auto const& stack : mc_model_checker->process().stack_areas()) + if (address == stack.address) + return true; + return false; } // TODO, this should depend on the snapshot? -static int is_block_stack(int block) +static bool is_block_stack(int block) { - unsigned int cursor = 0; - stack_region_t stack; - - xbt_dynar_foreach(stacks_areas, cursor, stack) { - if (block == stack->block) - return 1; - } - - return 0; + for (auto const& stack : mc_model_checker->process().stack_areas()) + if (block == stack.block) + return true; + return false; } -static void match_equals(struct s_mc_diff *state, xbt_dynar_t list) -{ +namespace simgrid { +namespace mc { +void StateComparator::match_equals(xbt_dynar_t list) +{ unsigned int cursor = 0; heap_area_pair_t current_pair; xbt_dynar_foreach(list, cursor, current_pair) { - if (current_pair->fragment1 != -1) { - - state->equals_to1_(current_pair->block1, current_pair->fragment1) = + this->equals_to1_(current_pair->block1, current_pair->fragment1) = make_heap_area(current_pair->block2, current_pair->fragment2); - state->equals_to2_(current_pair->block2, current_pair->fragment2) = + this->equals_to2_(current_pair->block2, current_pair->fragment2) = make_heap_area(current_pair->block1, current_pair->fragment1); - } else { - - state->equals_to1_(current_pair->block1, 0) = + this->equals_to1_(current_pair->block1, 0) = make_heap_area(current_pair->block2, current_pair->fragment2); - state->equals_to2_(current_pair->block2, 0) = + this->equals_to2_(current_pair->block2, 0) = make_heap_area(current_pair->block1, current_pair->fragment1); - } - } } -/** Check whether two blocks are known to be matching - * - * @param state State used - * @param b1 Block of state 1 - * @param b2 Block of state 2 - * @return if the blocks are known to be matching - */ -static int equal_blocks(struct s_mc_diff *state, int b1, int b2) +int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, + std::vector* i1, + std::vector* i2) { - - if (state->equals_to1_(b1, 0).block == b2 - && state->equals_to2_(b2, 0).block == b1) - return 1; - - return 0; + if (mc_diff_info == nullptr) + mc_diff_info = std::unique_ptr(new StateComparator()); + return mc_diff_info->initHeapInformation(heap1, heap2, i1, i2); } -/** Check whether two fragments are known to be matching - * - * @param state State used - * @param b1 Block of state 1 - * @param f1 Fragment of state 1 - * @param b2 Block of state 2 - * @param f2 Fragment of state 2 - * @return if the fragments are known to be matching - */ -static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, - int f2) +void ProcessComparisonState::initHeapInformation(xbt_mheap_t heap, + std::vector* i) { - - if (state->equals_to1_(b1, f1).block == b2 - && state->equals_to1_(b1, f1).fragment == f2 - && state->equals_to2_(b2, f2).block == b1 - && state->equals_to2_(b2, f2).fragment == f1) - return 1; - - return 0; + auto heaplimit = ((struct mdesc *) heap)->heaplimit; + this->heapsize = ((struct mdesc *) heap)->heapsize; + this->to_ignore = i; + this->equals_to.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, s_heap_area {0, 0, 0}); + this->types.assign(heaplimit * MAX_FRAGMENT_PER_BLOCK, nullptr); } -} - -int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2) +int StateComparator::initHeapInformation(xbt_mheap_t heap1, xbt_mheap_t heap2, + std::vector* i1, + std::vector* i2) { - if (mc_diff_info == NULL) { - mc_diff_info = xbt_new0(struct s_mc_diff, 1); - mc_diff_info->equals_to1 = NULL; - mc_diff_info->equals_to2 = NULL; - mc_diff_info->types1 = NULL; - mc_diff_info->types2 = NULL; - } - struct s_mc_diff *state = mc_diff_info; - if ((((struct mdesc *) heap1)->heaplimit != ((struct mdesc *) heap2)->heaplimit) || ((((struct mdesc *) heap1)->heapsize != ((struct mdesc *) heap2)->heapsize))) return -1; - - state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - - state->std_heap_copy = *mc_model_checker->process().get_heap(); - - state->heapsize1 = heap1->heapsize; - state->heapsize2 = heap2->heapsize; - - state->to_ignore1 = i1; - state->to_ignore2 = i2; - - if (state->heaplimit > state->available) { - state->equals_to1 = (s_heap_area_t*) - realloc(state->equals_to1, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(s_heap_area_t)); - state->types1 = (simgrid::mc::Type**) - realloc(state->types1, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(simgrid::mc::Type*)); - state->equals_to2 = (s_heap_area_t*) - realloc(state->equals_to2, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(s_heap_area_t)); - state->types2 = (simgrid::mc::Type**) - realloc(state->types2, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(simgrid::mc::Type*)); - state->available = state->heaplimit; - } - - memset(state->equals_to1, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - memset(state->equals_to2, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - memset(state->types1, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); - memset(state->types2, 0, - state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(type_name *)); - + this->heaplimit = ((struct mdesc *) heap1)->heaplimit; + this->std_heap_copy = *mc_model_checker->process().get_heap(); + this->processStates[0].initHeapInformation(heap1, i1); + this->processStates[1].initHeapInformation(heap2, i2); return 0; - } -extern "C" { - void reset_heap_information() { @@ -306,21 +294,18 @@ void reset_heap_information() // TODO, have a robust way to find it in O(1) static inline -mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot) +mc_mem_region_t MC_get_heap_region(simgrid::mc::Snapshot* snapshot) { - size_t n = snapshot->snapshot_regions.size(); - for (size_t i=0; i!=n; ++i) { - mc_mem_region_t region = snapshot->snapshot_regions[i].get(); + for (auto& region : snapshot->snapshot_regions) if (region->region_type() == simgrid::mc::RegionType::Heap) - return region; - } + return region.get(); xbt_die("No heap region"); } -int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) +int mmalloc_compare_heap(simgrid::mc::Snapshot* snapshot1, simgrid::mc::Snapshot* snapshot2) { simgrid::mc::Process* process = &mc_model_checker->process(); - struct s_mc_diff *state = mc_diff_info; + simgrid::mc::StateComparator *state = mc_diff_info.get(); /* Start comparison */ size_t i1, i2, j1, j2, k; @@ -388,28 +373,21 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = 0; /* Try first to associate to same block in the other heap */ - if (heapinfo2->type == heapinfo1->type) { - - if (state->equals_to2_(i1, 0).valid == 0) { - - addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + - (char *) state->std_heap_copy.heapbase; - - res_compare = - compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, - NULL, NULL, 0); - - if (res_compare != 1) { - for (k = 1; k < heapinfo2->busy_block.size; k++) - state->equals_to2_(i1 + k, 0) = make_heap_area(i1, -1); - for (k = 1; k < heapinfo1->busy_block.size; k++) - state->equals_to1_(i1 + k, 0) = make_heap_area(i1, -1); - equal = 1; - i1 += heapinfo1->busy_block.size; - } - + if (heapinfo2->type == heapinfo1->type + && state->equals_to2_(i1, 0).valid == 0) { + addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + + (char *) state->std_heap_copy.heapbase; + res_compare = + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, + nullptr, nullptr, 0); + if (res_compare != 1) { + for (k = 1; k < heapinfo2->busy_block.size; k++) + state->equals_to2_(i1 + k, 0) = make_heap_area(i1, -1); + for (k = 1; k < heapinfo1->busy_block.size; k++) + state->equals_to1_(i1 + k, 0) = make_heap_area(i1, -1); + equal = 1; + i1 += heapinfo1->busy_block.size; } - } while (i2 < state->heaplimit && !equal) { @@ -436,7 +414,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, - NULL, NULL, 0); + nullptr, nullptr, 0); if (res_compare != 1) { for (k = 1; k < heapinfo2b->busy_block.size; k++) @@ -476,26 +454,21 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) equal = 0; /* Try first to associate to same fragment in the other heap */ - if (heapinfo2->type == heapinfo1->type) { - - if (state->equals_to2_(i1, j1).valid == 0) { - - addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + - (char *) state->std_heap_copy.heapbase; - addr_frag2 = - (void *) ((char *) addr_block2 + - (j1 << heapinfo2->type)); - - res_compare = - compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, - NULL, NULL, 0); + if (heapinfo2->type == heapinfo1->type + && state->equals_to2_(i1, j1).valid == 0) { + addr_block2 = (ADDR2UINT(i1) - 1) * BLOCKSIZE + + (char *) state->std_heap_copy.heapbase; + addr_frag2 = + (void *) ((char *) addr_block2 + + (j1 << heapinfo2->type)); + res_compare = + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, + nullptr, nullptr, 0); + if (res_compare != 1) + equal = 1; + } - if (res_compare != 1) - equal = 1; - } - - } while (i2 < state->heaplimit && !equal) { @@ -536,7 +509,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) res_compare = compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2, - NULL, NULL, 0); + nullptr, nullptr, 0); if (res_compare != 1) { equal = 1; @@ -574,40 +547,26 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) for(i = 1; i < state->heaplimit; i++) { const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read( heap_region1, &heapinfo_temp1, &heapinfos1[i], sizeof(malloc_info)); - if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED) { - if (i1 == state->heaplimit) { - if (heapinfo1->busy_block.busy_size > 0) { - if (state->equals_to1_(i, 0).valid == 0) { - if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { - // TODO, add address - XBT_DEBUG("Block %zu not found (size used = %zu)", i, - heapinfo1->busy_block.busy_size); - //mmalloc_backtrace_block_display((void*)heapinfo1, i); - } - nb_diff1++; - } - } - } + + if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED + && i1 == state->heaplimit + && heapinfo1->busy_block.busy_size > 0 + && state->equals_to1_(i, 0).valid == 0) { + XBT_DEBUG("Block %zu not found (size used = %zu)", i, + heapinfo1->busy_block.busy_size); + nb_diff1++; } - if (heapinfo1->type > 0) { - for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo1->type); j++) { - if (i1 == state->heaplimit) { - if (heapinfo1->busy_frag.frag_size[j] > 0) { - if (state->equals_to1_(i, j).valid == 0) { - if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { - // TODO, print fragment address - XBT_DEBUG - ("Block %zu, Fragment %zu not found (size used = %zd)", - i, j, - heapinfo1->busy_frag.frag_size[j]); - //mmalloc_backtrace_fragment_display((void*)heapinfo1, i, j); - } - nb_diff1++; - } - } - } + + if (heapinfo1->type <= 0) + continue; + for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo1->type); j++) + if (i1 == state->heaplimit + && heapinfo1->busy_frag.frag_size[j] > 0 + && state->equals_to1_(i, j).valid == 0) { + XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", + i, j, heapinfo1->busy_frag.frag_size[j]); + nb_diff1++; } - } } if (i1 == state->heaplimit) @@ -616,46 +575,33 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) for (i=1; i < state->heaplimit; i++) { const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read( heap_region2, &heapinfo_temp2, &heapinfos2[i], sizeof(malloc_info)); - if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { - if (i1 == state->heaplimit) { - if (heapinfo2->busy_block.busy_size > 0) { - if (state->equals_to2_(i, 0).valid == 0) { - if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { - // TODO, print address of the block - XBT_DEBUG("Block %zu not found (size used = %zu)", i, - heapinfo2->busy_block.busy_size); - //mmalloc_backtrace_block_display((void*)heapinfo2, i); - } - nb_diff2++; - } - } - } + if (heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED + && i1 == state->heaplimit + && heapinfo2->busy_block.busy_size > 0 + && state->equals_to2_(i, 0).valid == 0) { + XBT_DEBUG("Block %zu not found (size used = %zu)", i, + heapinfo2->busy_block.busy_size); + nb_diff2++; } - if (heapinfo2->type > 0) { - for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo2->type); j++) { - if (i1 == state->heaplimit) { - if (heapinfo2->busy_frag.frag_size[j] > 0) { - if (state->equals_to2_(i, j).valid == 0) { - if (XBT_LOG_ISENABLED(mc_diff, xbt_log_priority_debug)) { - // TODO, print address of the block - XBT_DEBUG - ("Block %zu, Fragment %zu not found (size used = %zd)", - i, j, - heapinfo2->busy_frag.frag_size[j]); - //mmalloc_backtrace_fragment_display((void*)heapinfo2, i, j); - } - nb_diff2++; - } - } - } + + if (heapinfo2->type <= 0) + continue; + + for (j = 0; j < (size_t) (BLOCKSIZE >> heapinfo2->type); j++) + if (i1 == state->heaplimit + && heapinfo2->busy_frag.frag_size[j] > 0 + && state->equals_to2_(i, j).valid == 0) { + XBT_DEBUG("Block %zu, Fragment %zu not found (size used = %zd)", + i, j, heapinfo2->busy_frag.frag_size[j]); + nb_diff2++; } - } + } if (i1 == state->heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap2 : %d", nb_diff2); - return ((nb_diff1 > 0) || (nb_diff2 > 0)); + return nb_diff1 > 0 || nb_diff2 > 0; } /** @@ -669,32 +615,27 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) * @param size * @param check_ignore */ -static int compare_heap_area_without_type(struct s_mc_diff *state, int process_index, - const void *real_area1, const void *real_area2, - mc_snapshot_t snapshot1, - mc_snapshot_t snapshot2, - xbt_dynar_t previous, int size, - int check_ignore) +static int compare_heap_area_without_type( + simgrid::mc::StateComparator *state, int process_index, + const void *real_area1, const void *real_area2, + simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, + xbt_dynar_t previous, int size, + int check_ignore) { simgrid::mc::Process* process = &mc_model_checker->process(); - - int i = 0; - const void *addr_pointed1, *addr_pointed2; - int pointer_align, res_compare; - ssize_t ignore1, ignore2; - mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); - while (i < size) { + for (int i = 0; i < size; ) { if (check_ignore > 0) { - if ((ignore1 = - heap_comparison_ignore_size(state->to_ignore1, - (char *) real_area1 + i)) != -1) { - if ((ignore2 = - heap_comparison_ignore_size(state->to_ignore2, - (char *) real_area2 + i)) == ignore1) { + ssize_t ignore1 = heap_comparison_ignore_size( + state->processStates[0].to_ignore, (char *) real_area1 + i); + if (ignore1 != -1) { + ssize_t ignore2 = heap_comparison_ignore_size( + state->processStates[1].to_ignore, (char *) real_area2 + i); + if (ignore2 == ignore1) { if (ignore1 == 0) { check_ignore--; return 0; @@ -709,41 +650,39 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i if (MC_snapshot_region_memcmp(((char *) real_area1) + i, heap_region1, ((char *) real_area2) + i, heap_region2, 1) != 0) { - pointer_align = (i / sizeof(void *)) * sizeof(void *); - addr_pointed1 = snapshot1->read( + int pointer_align = (i / sizeof(void *)) * sizeof(void *); + const void* addr_pointed1 = snapshot1->read( remote((void**)((char *) real_area1 + pointer_align)), process_index); - addr_pointed2 = snapshot2->read( + const void* addr_pointed2 = snapshot2->read( remote((void**)((char *) real_area2 + pointer_align)), process_index); if (process->in_maestro_stack(remote(addr_pointed1)) && process->in_maestro_stack(remote(addr_pointed2))) { i = pointer_align + sizeof(void *); continue; - } else if (addr_pointed1 > state->std_heap_copy.heapbase - && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->std_heap_copy.heapbase - && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) { + } + + if (addr_pointed1 > state->std_heap_copy.heapbase + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->std_heap_copy.heapbase + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) { // Both addreses are in the heap: - res_compare = + int res_compare = compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, previous, NULL, 0); - if (res_compare == 1) { + snapshot2, previous, nullptr, 0); + if (res_compare == 1) return res_compare; - } i = pointer_align + sizeof(void *); continue; - } else { - return 1; } + return 1; } i++; - } return 0; - } /** @@ -760,26 +699,36 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i * @param pointer_level * @return 0 (same), 1 (different), -1 (unknown) */ -static int compare_heap_area_with_type(struct s_mc_diff *state, int process_index, - const void *real_area1, const void *real_area2, - mc_snapshot_t snapshot1, - mc_snapshot_t snapshot2, - xbt_dynar_t previous, simgrid::mc::Type* type, - int area_size, int check_ignore, - int pointer_level) +static int compare_heap_area_with_type( + simgrid::mc::StateComparator *state, int process_index, + const void *real_area1, const void *real_area2, + simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, + xbt_dynar_t previous, simgrid::mc::Type* type, + int area_size, int check_ignore, + int pointer_level) { top: - if (is_stack(real_area1) && is_stack(real_area2)) - return 0; - ssize_t ignore1, ignore2; + // HACK: This should not happen but in pratice, 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 + // <538837> DW_AT_decl_file : 98 + // <538838> DW_AT_decl_line : 37 + if (type == nullptr) + return 0; - if ((check_ignore > 0) - && ((ignore1 = heap_comparison_ignore_size(state->to_ignore1, real_area1)) - > 0) - && ((ignore2 = heap_comparison_ignore_size(state->to_ignore2, real_area2)) - == ignore1)) { + if (is_stack(real_area1) && is_stack(real_area2)) return 0; + + if (check_ignore > 0) { + ssize_t ignore1 = heap_comparison_ignore_size( + state->processStates[0].to_ignore, real_area1); + if (ignore1 > 0 + && heap_comparison_ignore_size( + state->processStates[1].to_ignore, real_area2) == ignore1) + return 0; } simgrid::mc::Type *subtype, *subsubtype; @@ -798,28 +747,27 @@ top: if (real_area1 == real_area2) return -1; else - return (MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0); + return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, area_size) != 0; } else { if (area_size != -1 && type->byte_size != area_size) return -1; - else { - return (MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); - } + else + return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; } break; + case DW_TAG_enumeration_type: if (area_size != -1 && type->byte_size != area_size) return -1; - else - return (MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0); - break; + return MC_snapshot_region_memcmp(real_area1, heap_region1, real_area2, heap_region2, type->byte_size) != 0; + case DW_TAG_typedef: case DW_TAG_const_type: case DW_TAG_volatile_type: // Poor man's TCO: type = type->subtype; goto top; - break; + case DW_TAG_array_type: subtype = type->subtype; switch (subtype->type) { @@ -863,100 +811,97 @@ top: if (res == 1) return res; } - break; + return 0; + case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: case DW_TAG_pointer_type: if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); - return (addr_pointed1 != addr_pointed2);; - } else { - pointer_level++; - if (pointer_level > 1) { /* Array of pointers */ - for (size_t i = 0; i < (area_size / sizeof(void *)); i++) { - addr_pointed1 = snapshot1->read( - remote((void**)((char*) real_area1 + i * sizeof(void *))), - process_index); - addr_pointed2 = snapshot2->read( - remote((void**)((char*) real_area2 + i * sizeof(void *))), - process_index); - if (addr_pointed1 > state->std_heap_copy.heapbase - && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->std_heap_copy.heapbase - && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - res = - compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, previous, type->subtype, - pointer_level); - else - res = (addr_pointed1 != addr_pointed2); - if (res == 1) - return res; - } - } else { - addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); - addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); - if (addr_pointed1 > state->std_heap_copy.heapbase - && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) - && addr_pointed2 > state->std_heap_copy.heapbase - && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) - return compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, previous, type->subtype, - pointer_level); - else - return (addr_pointed1 != addr_pointed2); - } + return (addr_pointed1 != addr_pointed2); } - break; + pointer_level++; + if (pointer_level <= 1) { + addr_pointed1 = snapshot1->read(remote((void**)real_area1), process_index); + addr_pointed2 = snapshot2->read(remote((void**)real_area2), process_index); + if (addr_pointed1 > state->std_heap_copy.heapbase + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->std_heap_copy.heapbase + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) + return compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, + snapshot2, previous, type->subtype, + pointer_level); + else + return (addr_pointed1 != addr_pointed2); + } + for (size_t i = 0; i < (area_size / sizeof(void *)); i++) { + addr_pointed1 = snapshot1->read( + remote((void**)((char*) real_area1 + i * sizeof(void *))), + process_index); + addr_pointed2 = snapshot2->read( + remote((void**)((char*) real_area2 + i * sizeof(void *))), + process_index); + if (addr_pointed1 > state->std_heap_copy.heapbase + && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1) + && addr_pointed2 > state->std_heap_copy.heapbase + && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2)) + res = + compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, + snapshot2, previous, type->subtype, + pointer_level); + else + res = (addr_pointed1 != addr_pointed2); + if (res == 1) + return res; + } + return 0; + case DW_TAG_structure_type: case DW_TAG_class_type: if (type->full_type) type = type->full_type; if (area_size != -1 && type->byte_size != area_size) { - if (area_size > type->byte_size && area_size % type->byte_size == 0) { - for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) { - res = - compare_heap_area_with_type(state, process_index, - (char *) real_area1 + i * type->byte_size, - (char *) real_area2 + i * type->byte_size, - snapshot1, snapshot2, previous, type, -1, - check_ignore, 0); - if (res == 1) - return res; - } - } else { + if (area_size <= type->byte_size || area_size % type->byte_size != 0) return -1; + for (size_t i = 0; i < (size_t)(area_size / type->byte_size); i++) { + int res = compare_heap_area_with_type(state, process_index, + (char *) real_area1 + i * type->byte_size, + (char *) real_area2 + i * type->byte_size, + snapshot1, snapshot2, previous, type, -1, + check_ignore, 0); + if (res == 1) + return res; } } else { - for(simgrid::mc::Type& member : type->members) { + for(simgrid::mc::Member& member : type->members) { // TODO, optimize this? (for the offset case) - void *real_member1 = - mc_member_resolve(real_area1, type, &member, (simgrid::mc::AddressSpace*) snapshot1, process_index); - void *real_member2 = - mc_member_resolve(real_area2, type, &member, (simgrid::mc::AddressSpace*) snapshot2, process_index); - res = - compare_heap_area_with_type(state, process_index, real_member1, real_member2, - snapshot1, snapshot2, - previous, member.subtype, -1, - check_ignore, 0); - if (res == 1) { + void *real_member1 = simgrid::dwarf::resolve_member( + real_area1, type, &member, (simgrid::mc::AddressSpace*) snapshot1, process_index); + void *real_member2 = simgrid::dwarf::resolve_member( + real_area2, type, &member, (simgrid::mc::AddressSpace*) snapshot2, process_index); + int res = compare_heap_area_with_type( + state, process_index, real_member1, real_member2, + snapshot1, snapshot2, + previous, member.type, -1, + check_ignore, 0); + if (res == 1) return res; - } } } - break; + return 0; + case DW_TAG_union_type: return compare_heap_area_without_type(state, process_index, real_area1, real_area2, snapshot1, snapshot2, previous, type->byte_size, check_ignore); - break; + return 0; + default: - break; + return 0; } - return 0; - + xbt_die("Unreachable"); } /** Infer the type of a part of the block from the type of the block @@ -971,7 +916,7 @@ top: */ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc::Type* type, int offset, int area_size, - mc_snapshot_t snapshot, int process_index) + simgrid::mc::Snapshot* snapshot, int process_index) { // Beginning of the block, the infered variable type if the type of the block: @@ -979,39 +924,36 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: return type; switch (type->type) { + case DW_TAG_structure_type: case DW_TAG_class_type: if (type->full_type) type = type->full_type; - if (area_size != -1 && type->byte_size != area_size) { if (area_size > type->byte_size && area_size % type->byte_size == 0) return type; else - return NULL; - } else { - for(simgrid::mc::Type& member : type->members) { - - if (member.has_offset_location()) { - // We have the offset, use it directly (shortcut): - if (member.offset() == offset) - return member.subtype; - } else { - void *real_member = - mc_member_resolve(real_base_address, type, &member, - snapshot, process_index); - if ((char*) real_member - (char *) real_base_address == offset) - return member.subtype; - } + return nullptr; + } + for(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, process_index); + if ((char*) real_member - (char *) real_base_address == offset) + return member.type; } - return NULL; } - break; + return nullptr; + default: /* FIXME : other cases ? */ - return NULL; - break; + return nullptr; + } } @@ -1021,18 +963,18 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: * @param area2 Process address for state 2 * @param snapshot1 Snapshot of state 1 * @param snapshot2 Snapshot of state 2 - * @param previous Pairs of blocks already compared on the current path (or NULL) + * @param previous Pairs of blocks already compared on the current path (or nullptr) * @param type_id Type of variable * @param pointer_level * @return 0 (same), 1 (different), -1 */ -int compare_heap_area(int process_index, const void *area1, const void *area2, mc_snapshot_t snapshot1, - mc_snapshot_t snapshot2, xbt_dynar_t previous, +int compare_heap_area(int process_index, const void *area1, const void *area2, simgrid::mc::Snapshot* snapshot1, + simgrid::mc::Snapshot* snapshot2, xbt_dynar_t previous, simgrid::mc::Type* type, int pointer_level) { simgrid::mc::Process* process = &mc_model_checker->process(); - struct s_mc_diff *state = mc_diff_info; + simgrid::mc::StateComparator *state = mc_diff_info.get(); int res_compare; ssize_t block1, frag1, block2, frag2; @@ -1043,7 +985,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m int type_size = -1; int offset1 = 0, offset2 = 0; int new_size1 = -1, new_size2 = -1; - simgrid::mc::Type *new_type1 = NULL, *new_type2 = NULL; + simgrid::mc::Type *new_type1 = nullptr, *new_type2 = nullptr; int match_pairs = 0; @@ -1057,7 +999,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m malloc_info heapinfo_temp1, heapinfo_temp2; - if (previous == NULL) { + if (previous == nullptr) { previous = xbt_dynar_new(sizeof(heap_area_pair_t), heap_area_pair_free_voidp); match_pairs = 1; @@ -1074,19 +1016,19 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if (is_block_stack((int) block1) && is_block_stack((int) block2)) { add_heap_area_pair(previous, block1, -1, block2, -1); if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; } + // If either block is not in the expected area of memory: if (((char *) area1 < (char *) state->std_heap_copy.heapbase) - || (block1 > (ssize_t) state->heapsize1) || (block1 < 1) + || (block1 > (ssize_t) state->processStates[0].heapsize) || (block1 < 1) || ((char *) area2 < (char *) state->std_heap_copy.heapbase) - || (block2 > (ssize_t) state->heapsize2) || (block2 < 1)) { - if (match_pairs) { + || (block2 > (ssize_t) state->processStates[1].heapsize) || (block2 < 1)) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } @@ -1102,12 +1044,12 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m type = type->full_type; // This assume that for "boring" types (volatile ...) byte_size is absent: - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; // Find type_size: - if ((type->type == DW_TAG_pointer_type) - || ((type->type == DW_TAG_base_type) && !type->name.empty() + if (type->type == DW_TAG_pointer_type + || (type->type == DW_TAG_base_type && !type->name.empty() && type->name == "char")) type_size = -1; else @@ -1125,15 +1067,15 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if ((heapinfo1->type == MMALLOC_TYPE_FREE || heapinfo1->type==MMALLOC_TYPE_HEAPINFO) && (heapinfo2->type == MMALLOC_TYPE_FREE || heapinfo2->type ==MMALLOC_TYPE_HEAPINFO)) { - /* Free block */ if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; + } - } else if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED + if (heapinfo1->type == MMALLOC_TYPE_UNFRAGMENTED && heapinfo2->type == MMALLOC_TYPE_UNFRAGMENTED) { /* Complete block */ @@ -1143,14 +1085,13 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m offset2 = (char *) area2 - (char *) real_addr_block2; if (state->equals_to1_(block1, 0).valid - && state->equals_to2_(block2, 0).valid) { - if (equal_blocks(state, block1, block2)) { - if (match_pairs) { - match_equals(state, previous); - xbt_dynar_free(&previous); - } - return 0; + && state->equals_to2_(block2, 0).valid + && state->blocksEqual(block1, block2)) { + if (match_pairs) { + state->match_equals(previous); + xbt_dynar_free(&previous); } + return 0; } if (type_size != -1) { @@ -1158,32 +1099,28 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m && type_size != (ssize_t) heapinfo2->busy_block.busy_size && (type->name.empty() || type->name == "struct s_smx_context")) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; } } - if (heapinfo1->busy_block.size != - heapinfo2->busy_block.size) { - if (match_pairs) { + if (heapinfo1->busy_block.size != heapinfo2->busy_block.size) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } - if (heapinfo1->busy_block.busy_size != - heapinfo2->busy_block.busy_size) { - if (match_pairs) { + if (heapinfo1->busy_block.busy_size != heapinfo2->busy_block.busy_size) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } if (!add_heap_area_pair(previous, block1, -1, block2, -1)) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; @@ -1193,16 +1130,14 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Remember (basic) type inference. // The current data structure only allows us to do this for the whole block. - if (type != NULL && area1 == real_addr_block1) { + if (type != nullptr && area1 == real_addr_block1) state->types1_(block1, 0) = type; - } - if (type != NULL && area2 == real_addr_block2) { + if (type != nullptr && area2 == real_addr_block2) state->types2_(block2, 0) = type; - } if (size <= 0) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; @@ -1211,9 +1146,8 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m frag1 = -1; frag2 = -1; - 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 */ @@ -1237,7 +1171,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if (heapinfo1->busy_frag.frag_size[frag1] == -1 || heapinfo2->busy_frag.frag_size[frag2] == -1) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; @@ -1246,7 +1180,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if (type_size != heapinfo1->busy_frag.frag_size[frag1] || type_size != heapinfo2->busy_frag.frag_size[frag2]) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; @@ -1256,9 +1190,9 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Check if the blocks are already matched together: if (state->equals_to1_(block1, frag1).valid && state->equals_to2_(block2, frag2).valid) { - if (offset1==offset2 && equal_fragments(state, block1, frag1, block2, frag2)) { + if (offset1==offset2 && state->fragmentsEqual(block1, frag1, block2, frag2)) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; @@ -1269,14 +1203,13 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m heapinfo2->busy_frag.frag_size[frag2]) { if (type_size == -1) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; } else { - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; } } @@ -1286,40 +1219,39 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Remember (basic) type inference. // The current data structure only allows us to do this for the whole fragment. - if (type != NULL && area1 == real_addr_frag1) { + if (type != nullptr && area1 == real_addr_frag1) state->types1_(block1, frag1) = type; - } - if (type != NULL && area2 == real_addr_frag2) { + if (type != nullptr && area2 == real_addr_frag2) state->types2_(block2, frag2) = type; - } + // The type of the variable is already known: if (type) { new_type1 = type; new_type2 = type; } // Type inference from the block type. - else if (state->types1_(block1, frag1) != NULL - || state->types2_(block2, frag2) != NULL) { + 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) != NULL - && state->types2_(block2, frag2) != NULL) { + 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, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types2_(block2, frag2), offset1, size, snapshot2, process_index); - } else if (state->types1_(block1, frag1) != NULL) { + } else if (state->types1_(block1, frag1) != nullptr) { new_type1 = get_offset_type(real_addr_frag1, state->types1_(block1, frag1), offset1, size, snapshot1, process_index); new_type2 = get_offset_type(real_addr_frag2, state->types1_(block1, frag1), offset2, size, snapshot2, process_index); - } else if (state->types2_(block2, frag2) != NULL) { + } else if (state->types2_(block2, frag2) != nullptr) { new_type1 = get_offset_type(real_addr_frag1, state->types2_(block2, frag2), offset1, size, snapshot1, process_index); @@ -1328,27 +1260,27 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m offset2, size, snapshot2, process_index); } else { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; } - if (new_type1 != NULL && new_type2 != NULL && new_type1 != new_type2) { + if (new_type1 != nullptr && new_type2 != nullptr && new_type1 != new_type2) { type = new_type1; - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; new_size1 = type->byte_size; type = new_type2; - while (type->byte_size == 0 && type->subtype != NULL) + while (type->byte_size == 0 && type->subtype != nullptr) type = type->subtype; new_size2 = type->byte_size; } else { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return -1; @@ -1360,19 +1292,18 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m size = new_size1; } - if (offset1 == 0 && offset2 == 0) { - if (!add_heap_area_pair(previous, block1, frag1, block2, frag2)) { + if (offset1 == 0 && offset2 == 0 + && !add_heap_area_pair(previous, block1, frag1, block2, frag2)) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; } - } if (size <= 0) { if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; @@ -1384,26 +1315,23 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m check_ignore = heapinfo1->busy_frag.ignore[frag1]; } else { - - if (match_pairs) { + if (match_pairs) xbt_dynar_free(&previous); - } return 1; - } /* Start comparison */ - if (type) { + if (type) res_compare = compare_heap_area_with_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, type, size, check_ignore, pointer_level); - } else { + else res_compare = compare_heap_area_without_type(state, process_index, area1, area2, snapshot1, snapshot2, previous, size, check_ignore); - } + if (res_compare == 1) { if (match_pairs) xbt_dynar_free(&previous); @@ -1411,207 +1339,12 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m } if (match_pairs) { - match_equals(state, previous); + state->match_equals(previous); xbt_dynar_free(&previous); } return 0; } -/*********************************************** Miscellaneous ***************************************************/ -/****************************************************************************************************************/ - -// Not used and broken code: -# if 0 - -// Not used: -static int get_pointed_area_size(void *area, int heap) -{ - - struct s_mc_diff *state = mc_diff_info; - - int block, frag; - malloc_info *heapinfo; - - if (heap == 1) - heapinfo = state->heapinfo1; - else - heapinfo = state->heapinfo2; - - block = - ((char *) area - - (char *) state->std_heap_copy.heapbase) / BLOCKSIZE + 1; - - if (((char *) area < (char *) state->std_heap_copy.heapbase) - || (block > state->heapsize1) || (block < 1)) - return -1; - - if (heapinfo[block].type == MMALLOC_TYPE_FREE || heapinfo[block].type == MMALLOC_TYPE_HEAPINFO) { /* Free block */ - return -1; - } else if (heapinfo[block].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Complete block */ - return (int) heapinfo[block].busy_block.busy_size; - } else { - frag = - ((uintptr_t) (ADDR2UINT(area) % (BLOCKSIZE))) >> heapinfo[block].type; - return (int) heapinfo[block].busy_frag.frag_size[frag]; - } } - -#ifndef max -#define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) -#endif - -// Not used: -int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) -{ - - struct s_mc_diff *state = mc_diff_info; - - if (heap1 == NULL && heap1 == NULL) { - XBT_DEBUG("Malloc descriptors null"); - return 0; - } - - if (heap1->heaplimit != heap2->heaplimit) { - XBT_DEBUG("Different limit of valid info table indices"); - return 1; - } - - /* Heap information */ - state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - - state->std_heap_copy = *mc_model_checker->process().get_heap(); - - state->heapbase1 = (char *) heap1 + BLOCKSIZE; - state->heapbase2 = (char *) heap2 + BLOCKSIZE; - - state->heapinfo1 = - (malloc_info *) ((char *) heap1 + - ((uintptr_t) - ((char *) heap1->heapinfo - (char *) state->s_heap))); - state->heapinfo2 = - (malloc_info *) ((char *) heap2 + - ((uintptr_t) - ((char *) heap2->heapinfo - (char *) state->s_heap))); - - state->heapsize1 = heap1->heapsize; - state->heapsize2 = heap2->heapsize; - - /* Start comparison */ - size_t i, j, k; - void *addr_block1, *addr_block2, *addr_frag1, *addr_frag2; - - int distance = 0; - - /* Check busy blocks */ - - i = 1; - - while (i <= state->heaplimit) { - - addr_block1 = - ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + - (char *) state->heapbase1)); - addr_block2 = - ((void *) (((ADDR2UINT(i)) - 1) * BLOCKSIZE + - (char *) state->heapbase2)); - - if (state->heapinfo1[i].type != state->heapinfo2[i].type) { - - distance += BLOCKSIZE; - XBT_DEBUG("Different type of blocks (%zu) : %d - %d -> distance = %d", i, - state->heapinfo1[i].type, state->heapinfo2[i].type, distance); - i++; - - } else { - - if (state->heapinfo1[i].type == MMALLOC_TYPE_FREE - || state->heapinfo1[i].type == MMALLOC_TYPE_HAPINFO) { /* Free block */ - i++; - continue; - } - - if (state->heapinfo1[i].type == MMALLOC_TYPE_UNFRAGMENTED) { /* Large block */ - - if (state->heapinfo1[i].busy_block.size != - state->heapinfo2[i].busy_block.size) { - distance += - BLOCKSIZE * max(state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size); - i += max(state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size); - XBT_DEBUG - ("Different larger of cluster at block %zu : %zu - %zu -> distance = %d", - i, state->heapinfo1[i].busy_block.size, - state->heapinfo2[i].busy_block.size, distance); - continue; - } - - /*if(heapinfo1[i].busy_block.busy_size != heapinfo2[i].busy_block.busy_size){ - distance += max(heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size); - i += max(heapinfo1[i].busy_block.size, heapinfo2[i].busy_block.size); - XBT_DEBUG("Different size used oin large cluster at block %zu : %zu - %zu -> distance = %d", i, heapinfo1[i].busy_block.busy_size, heapinfo2[i].busy_block.busy_size, distance); - continue; - } */ - - k = 0; - - //while(k < (heapinfo1[i].busy_block.busy_size)){ - while (k < state->heapinfo1[i].busy_block.size * BLOCKSIZE) { - if (memcmp((char *) addr_block1 + k, (char *) addr_block2 + k, 1) != - 0) { - distance++; - } - k++; - } - - i++; - - } else { /* Fragmented block */ - - for (j = 0; j < (size_t) (BLOCKSIZE >> state->heapinfo1[i].type); j++) { - - addr_frag1 = - (void *) ((char *) addr_block1 + (j << state->heapinfo1[i].type)); - addr_frag2 = - (void *) ((char *) addr_block2 + (j << state->heapinfo2[i].type)); - - if (state->heapinfo1[i].busy_frag.frag_size[j] == 0 - && state->heapinfo2[i].busy_frag.frag_size[j] == 0) { - continue; - } - - - /*if(heapinfo1[i].busy_frag.frag_size[j] != heapinfo2[i].busy_frag.frag_size[j]){ - distance += max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j]); - XBT_DEBUG("Different size used in fragment %zu in block %zu : %d - %d -> distance = %d", j, i, heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j], distance); - continue; - } */ - - k = 0; - - //while(k < max(heapinfo1[i].busy_frag.frag_size[j], heapinfo2[i].busy_frag.frag_size[j])){ - while (k < (BLOCKSIZE / (BLOCKSIZE >> state->heapinfo1[i].type))) { - if (memcmp((char *) addr_frag1 + k, (char *) addr_frag2 + k, 1) != - 0) { - distance++; - } - k++; - } - - } - - i++; - - } - - } - - } - - return distance; - -} -#endif - }