X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cdf8123ef60cd6d3afdddffd7902dec56bb52a50..6659e698628302ff3b8663fe612044375e092fe3:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index d489ae5e2e..fc96ef0b82 100644 --- a/src/mc/mc_diff.cpp +++ b/src/mc/mc_diff.cpp @@ -1,6 +1,6 @@ /* 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 @@ -14,6 +14,7 @@ #include "mc/datatypes.h" #include "mc/mc_private.h" #include "mc/mc_snapshot.h" +#include "mc/Type.hpp" using simgrid::mc::remote; @@ -25,125 +26,12 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_diff, xbt, 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; // Number of blocks in the heaps: @@ -151,7 +39,8 @@ struct s_mc_diff { std::vector* to_ignore1; std::vector* to_ignore2; s_heap_area_t *equals_to1, *equals_to2; - mc_type_t *types1, *types2; + simgrid::mc::Type **types1; + simgrid::mc::Type **types2; size_t available; }; @@ -383,7 +272,7 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, state->types1 = (simgrid::mc::Type**) realloc(state->types1, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(type_name *)); + sizeof(simgrid::mc::Type*)); state->equals_to2 = (s_heap_area_t*) realloc(state->equals_to2, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * @@ -391,7 +280,7 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, state->types2 = (simgrid::mc::Type**) realloc(state->types2, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * - sizeof(type_name *)); + sizeof(simgrid::mc::Type*)); state->available = state->heaplimit; } @@ -430,7 +319,7 @@ mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot) int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); struct s_mc_diff *state = mc_diff_info; /* Start comparison */ @@ -459,7 +348,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)); @@ -523,7 +412,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; @@ -608,7 +497,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], @@ -682,7 +571,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) { @@ -724,7 +613,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) { @@ -787,7 +676,7 @@ static int compare_heap_area_without_type(struct s_mc_diff *state, int process_i xbt_dynar_t previous, int size, int check_ignore) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); int i = 0; const void *addr_pointed1, *addr_pointed2; @@ -875,7 +764,7 @@ static int compare_heap_area_with_type(struct s_mc_diff *state, int process_inde const void *real_area1, const void *real_area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, - xbt_dynar_t previous, mc_type_t type, + xbt_dynar_t previous, simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) { @@ -893,7 +782,7 @@ top: return 0; } - mc_type_t subtype, subsubtype; + simgrid::mc::Type *subtype, *subsubtype; int res, elm_size; const void *addr_pointed1, *addr_pointed2; @@ -1043,9 +932,9 @@ top: for(simgrid::mc::Type& member : type->members) { // TODO, optimize this? (for the offset case) void *real_member1 = - mc_member_resolve(real_area1, type, &member, (mc_address_space_t) snapshot1, process_index); + mc_member_resolve(real_area1, type, &member, (simgrid::mc::AddressSpace*) snapshot1, process_index); void *real_member2 = - mc_member_resolve(real_area2, type, &member, (mc_address_space_t) snapshot2, process_index); + 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, @@ -1080,7 +969,7 @@ top: * @param area_size * @return DWARF type ID for given offset */ -static mc_type_t get_offset_type(void *real_base_address, mc_type_t type, +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) { @@ -1139,9 +1028,9 @@ static mc_type_t get_offset_type(void *real_base_address, mc_type_t type, */ 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, - mc_type_t type, int pointer_level) + simgrid::mc::Type* type, int pointer_level) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); struct s_mc_diff *state = mc_diff_info; @@ -1154,7 +1043,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; - mc_type_t new_type1 = NULL, new_type2 = NULL; + simgrid::mc::Type *new_type1 = NULL, *new_type2 = NULL; int match_pairs = 0;