X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ba012095972bdc4a8067424136dbcdeb011446d5..20bbf9b0608d4ab29fb25ab4f795001d0cdca5b5:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index fc96ef0b82..1490675bac 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1,20 +1,20 @@ -/* 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 */ +/* mc_diff - Memory snapshooting and comparison */ + +#include "src/xbt/ex_interface.h" /* internals of backtrace setup */ #include "xbt/str.h" #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/mc_private.h" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_dwarf.hpp" +#include "src/mc/Type.hpp" using simgrid::mc::remote; @@ -23,9 +23,6 @@ extern "C" { 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 ***********************************/ /***************************************************************************************/ @@ -33,15 +30,15 @@ typedef char *type_name; struct XBT_PRIVATE s_mc_diff { s_xbt_mheap_t std_heap_copy; - size_t heaplimit; + std::size_t heaplimit; // Number of blocks in the heaps: - size_t heapsize1, heapsize2; - std::vector* to_ignore1; - std::vector* to_ignore2; + std::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 available; }; #define equals_to1_(i,j) equals_to1[ MAX_FRAGMENT_PER_BLOCK*(i) + (j)] @@ -49,14 +46,14 @@ struct XBT_PRIVATE s_mc_diff { #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; +static __thread struct s_mc_diff *mc_diff_info = nullptr; /*********************************** 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 +64,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; } /************************************************************************************/ @@ -104,7 +101,7 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, { if (is_new_heap_area_pair(list, block1, fragment1, block2, fragment2)) { - heap_area_pair_t pair = NULL; + heap_area_pair_t pair = nullptr; pair = xbt_new0(s_heap_area_pair_t, 1); pair->block1 = block1; pair->fragment1 = fragment1; @@ -119,15 +116,16 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, return 0; } -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,31 +137,21 @@ 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) @@ -235,15 +223,15 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, } int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, - std::vector* i1, - std::vector* i2) + std::vector* i1, + std::vector* i2) { - if (mc_diff_info == NULL) { + if (mc_diff_info == nullptr) { 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; + mc_diff_info->equals_to1 = nullptr; + mc_diff_info->equals_to2 = nullptr; + mc_diff_info->types1 = nullptr; + mc_diff_info->types2 = nullptr; } struct s_mc_diff *state = mc_diff_info; @@ -348,7 +336,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) const malloc_info* heapinfos2 = snapshot2->read( (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); - while (i1 < state->heaplimit) { + while (i1 <= state->heaplimit) { const malloc_info* heapinfo1 = (const malloc_info*) MC_region_read(heap_region1, &heapinfo_temp1, &heapinfos1[i1], sizeof(malloc_info)); const malloc_info* heapinfo2 = (const malloc_info*) MC_region_read(heap_region2, &heapinfo_temp2, &heapinfos2[i1], sizeof(malloc_info)); @@ -397,7 +385,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, NULL, 0); if (res_compare != 1) { for (k = 1; k < heapinfo2->busy_block.size; k++) @@ -412,7 +400,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } - while (i2 < state->heaplimit && !equal) { + while (i2 <= state->heaplimit && !equal) { addr_block2 = (ADDR2UINT(i2) - 1) * BLOCKSIZE + (char *) state->std_heap_copy.heapbase; @@ -436,7 +424,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, NULL, 0); if (res_compare != 1) { for (k = 1; k < heapinfo2b->busy_block.size; k++) @@ -488,7 +476,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, snapshot1, snapshot2, - NULL, NULL, 0); + nullptr, NULL, 0); if (res_compare != 1) equal = 1; @@ -497,7 +485,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } - while (i2 < state->heaplimit && !equal) { + while (i2 <= state->heaplimit && !equal) { const malloc_info* heapinfo2b = (const malloc_info*) MC_region_read( heap_region2, &heapinfo_temp2b, &heapinfos2[i2], @@ -536,7 +524,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, NULL, 0); if (res_compare != 1) { equal = 1; @@ -571,7 +559,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) /* All blocks/fragments are equal to another block/fragment ? */ size_t i = 1, j = 0; - for(i = 1; i < state->heaplimit; i++) { + 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) { @@ -613,7 +601,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) if (i1 == state->heaplimit) XBT_DEBUG("Number of blocks/fragments not found in heap1 : %d", nb_diff1); - for (i=1; i < state->heaplimit; i++) { + 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) { @@ -726,7 +714,7 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i // Both addreses are in the heap: res_compare = compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, - snapshot2, previous, NULL, 0); + snapshot2, previous, nullptr, 0); if (res_compare == 1) { return res_compare; } @@ -769,9 +757,13 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, int process_inde int pointer_level) { top: - if (is_stack(real_area1) && is_stack(real_area2)) + // HACK: This should not happen but in pratice, there is some + // DW_TAG_typedef without DW_AT_type. We should fix this somehow. + if (type == nullptr) return 0; + if (is_stack(real_area1) && is_stack(real_area2)) + return 0; ssize_t ignore1, ignore2; if ((check_ignore > 0) @@ -929,16 +921,16 @@ top: return -1; } } 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); + 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); res = - compare_heap_area_with_type(state, process_index, real_member1, real_member2, + compare_heap_area_with_type(state, process_index, real_member1, real_member2, snapshot1, snapshot2, - previous, member.subtype, -1, + previous, member.type, -1, check_ignore, 0); if (res == 1) { return res; @@ -988,29 +980,28 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: if (area_size > type->byte_size && area_size % type->byte_size == 0) return type; else - return NULL; + return nullptr; } else { - for(simgrid::mc::Type& member : type->members) { + 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.subtype; + return member.type; } else { - void *real_member = - mc_member_resolve(real_base_address, type, &member, - snapshot, process_index); + 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.subtype; + return member.type; } } - return NULL; + return nullptr; } break; default: /* FIXME : other cases ? */ - return NULL; + return nullptr; break; } } @@ -1021,7 +1012,7 @@ 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 @@ -1043,7 +1034,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 = NULL; int match_pairs = 0; @@ -1057,7 +1048,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; @@ -1102,7 +1093,7 @@ 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: @@ -1193,10 +1184,10 @@ 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; } @@ -1286,10 +1277,10 @@ 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: @@ -1298,28 +1289,28 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m 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); @@ -1334,15 +1325,15 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m return -1; } - if (new_type1 != NULL && new_type2 != NULL && new_type1 != new_type2) { + if (new_type1 != nullptr && new_type2 != NULL && 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; @@ -1467,7 +1458,7 @@ 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) { + if (heap1 == nullptr && heap1 == NULL) { XBT_DEBUG("Malloc descriptors null"); return 0; }