X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/3b53885f888f2539a533797e76a3f3ff84cdfe0c..6992bd8145f706de66cefa592135dcb0629593d4:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index 68e13981be..89b5b544eb 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1,20 +1,21 @@ -/* mc_diff - Memory snapshooting and comparison */ - -/* Copyright (c) 2008-2014. The SimGrid Team. +/* 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 "src/mc/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,138 +24,22 @@ 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; - - - -/********************************* Backtrace ***********************************/ -/******************************************************************************/ - -static void mmalloc_backtrace_block_display(void *heapinfo, int block) -{ - - /* xbt_ex_t e; */ - - /* if (((malloc_info *)heapinfo)[block].busy_block.bt_size == 0) { */ - /* fprintf(stderr, "No backtrace available for that block, sorry.\n"); */ - /* return; */ - /* } */ - - /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_block.bt),sizeof(void*)*XBT_BACKTRACE_SIZE); */ - /* e.used = ((malloc_info *)heapinfo)[block].busy_block.bt_size; */ - - /* xbt_ex_setup_backtrace(&e); */ - /* if (e.used == 0) { */ - /* fprintf(stderr, "(backtrace not set)\n"); */ - /* } else if (e.bt_strings == NULL) { */ - /* fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */ - /* } else { */ - /* int i; */ - - /* fprintf(stderr, "Backtrace of where the block %d was malloced (%d frames):\n", block ,e.used); */ - /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */ - /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */ - /* } */ - /* } */ -} - -static void mmalloc_backtrace_fragment_display(void *heapinfo, int block, - int frag) -{ - - /* xbt_ex_t e; */ - - /* memcpy(&e.bt,&(((malloc_info *)heapinfo)[block].busy_frag.bt[frag]),sizeof(void*)*XBT_BACKTRACE_SIZE); */ - /* e.used = XBT_BACKTRACE_SIZE; */ - - /* xbt_ex_setup_backtrace(&e); */ - /* if (e.used == 0) { */ - /* fprintf(stderr, "(backtrace not set)\n"); */ - /* } else if (e.bt_strings == NULL) { */ - /* fprintf(stderr, "(backtrace not ready to be computed. %s)\n",xbt_binary_name?"Dunno why":"xbt_binary_name not setup yet"); */ - /* } else { */ - /* int i; */ - - /* fprintf(stderr, "Backtrace of where the fragment %d in block %d was malloced (%d frames):\n", frag, block ,e.used); */ - /* for (i = 0; i < e.used; i++) /\* no need to display "xbt_backtrace_display" *\/{ */ - /* fprintf(stderr, "%d ---> %s\n",i, e.bt_strings[i] + 4); */ - /* } */ - /* } */ - -} - -static void mmalloc_backtrace_display(void *addr) -{ - - /* size_t block, frag_nb; */ - /* int type; */ - - /* block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1); */ - - /* type = heap->heapinfo[block].type; */ - - /* switch(type){ */ - /* case MMALLOC_TYPE_HEAPINFO : */ - /* case MMALLOC_TYPE_FREE : /\* Free block *\/ */ - /* fprintf(stderr, "Asked to display the backtrace of a block that is free. I'm puzzled\n"); */ - /* xbt_abort(); */ - /* break; */ - /* case 0: /\* Large block *\/ */ - /* mmalloc_backtrace_block_display(heap->heapinfo, block); */ - /* break; */ - /* default: /\* Fragmented block *\/ */ - /* frag_nb = RESIDUAL(addr, BLOCKSIZE) >> type; */ - /* if(heap->heapinfo[block].busy_frag.frag_size[frag_nb] == -1){ */ - /* fprintf(stderr , "Asked to display the backtrace of a fragment that is free. I'm puzzled\n"); */ - /* xbt_abort(); */ - /* } */ - /* mmalloc_backtrace_fragment_display(heap->heapinfo, block, frag_nb); */ - /* break; */ - /* } */ -} - - -static int compare_backtrace(int b1, int f1, int b2, int f2) -{ - /*int i = 0; - if(f1 != -1){ - for(i=0; i< XBT_BACKTRACE_SIZE; i++){ - if(heapinfo1[b1].busy_frag.bt[f1][i] != heapinfo2[b2].busy_frag.bt[f2][i]){ - //mmalloc_backtrace_fragment_display((void*)heapinfo1, b1, f1); - //mmalloc_backtrace_fragment_display((void*)heapinfo2, b2, f2); - return 1; - } - } - }else{ - for(i=0; i< heapinfo1[b1].busy_block.bt_size; i++){ - if(heapinfo1[b1].busy_block.bt[i] != heapinfo2[b2].busy_block.bt[i]){ - //mmalloc_backtrace_block_display((void*)heapinfo1, b1); - //mmalloc_backtrace_block_display((void*)heapinfo2, b2); - return 1; - } - } - } */ - return 0; -} - - /*********************************** Heap comparison ***********************************/ /***************************************************************************************/ typedef char *type_name; -struct s_mc_diff { +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)] @@ -162,7 +47,7 @@ struct 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 ************************************/ @@ -232,15 +117,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) @@ -252,31 +138,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) @@ -348,8 +224,8 @@ 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) { mc_diff_info = xbt_new0(struct s_mc_diff, 1); @@ -461,7 +337,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)); @@ -525,7 +401,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; @@ -610,7 +486,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], @@ -684,7 +560,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) { @@ -726,7 +602,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) { @@ -882,9 +758,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) @@ -1042,16 +922,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; @@ -1103,18 +983,17 @@ static simgrid::mc::Type* get_offset_type(void *real_base_address, simgrid::mc:: else return NULL; } 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; } }