X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ea9cce21b6d3f37823143217f1ca183bb2f0c9ac..6c686f5c734739033f848b8009c9b825b7aa9c1d:/src/mc/mc_diff.cpp diff --git a/src/mc/mc_diff.cpp b/src/mc/mc_diff.cpp index 5b692dcb0a..0887737206 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,9 @@ #include "mc/datatypes.h" #include "mc/mc_private.h" #include "mc/mc_snapshot.h" +#include "mc/Type.hpp" + +using simgrid::mc::remote; extern "C" { @@ -87,8 +90,6 @@ static void mmalloc_backtrace_display(void *addr) /* size_t block, frag_nb; */ /* int type; */ - /* xbt_mheap_t heap = __mmalloc_current_heap ?: (xbt_mheap_t) mmalloc_preinit(); */ - /* block = (((char*) (addr) - (char*) heap -> heapbase) / BLOCKSIZE + 1); */ /* type = heap->heapinfo[block].type; */ @@ -143,14 +144,16 @@ static int compare_backtrace(int b1, int f1, int b2, int f2) 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: size_t heapsize1, heapsize2; - xbt_dynar_t to_ignore1, to_ignore2; + std::vector* to_ignore1; + std::vector* to_ignore2; s_heap_area_t *equals_to1, *equals_to2; - dw_type_t *types1, *types2; + simgrid::mc::Type **types1; + simgrid::mc::Type **types2; size_t available; }; @@ -229,25 +232,20 @@ static int add_heap_area_pair(xbt_dynar_t list, int block1, int fragment1, return 0; } -static ssize_t heap_comparison_ignore_size(xbt_dynar_t ignore_list, +static ssize_t heap_comparison_ignore_size(std::vector* ignore_list, const void *address) { - - unsigned int cursor = 0; int start = 0; - int end = xbt_dynar_length(ignore_list) - 1; - mc_heap_ignore_region_t region; + int end = ignore_list->size() - 1; while (start <= end) { - cursor = (start + end) / 2; - region = - (mc_heap_ignore_region_t) xbt_dynar_get_as(ignore_list, cursor, - mc_heap_ignore_region_t); - if (region->address == address) - return region->size; - if (region->address < address) + unsigned int cursor = (start + end) / 2; + s_mc_heap_ignore_region_t region = (*ignore_list)[cursor]; + if (region.address == address) + return region.size; + if (region.address < address) start = cursor + 1; - if (region->address > address) + if (region.address > address) end = cursor - 1; } @@ -347,8 +345,11 @@ static int equal_fragments(struct s_mc_diff *state, int b1, int f1, int b2, return 0; } -int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, - xbt_dynar_t i2) +} + +int init_heap_information(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); @@ -368,7 +369,7 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process); + state->std_heap_copy = *mc_model_checker->process().get_heap(); state->heapsize1 = heap1->heapsize; state->heapsize2 = heap2->heapsize; @@ -381,18 +382,18 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, realloc(state->equals_to1, state->heaplimit * MAX_FRAGMENT_PER_BLOCK * sizeof(s_heap_area_t)); - state->types1 = (s_dw_type**) + 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 * sizeof(s_heap_area_t)); - state->types2 = (s_dw_type**) + 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; } @@ -409,6 +410,8 @@ int init_heap_information(xbt_mheap_t heap1, xbt_mheap_t heap2, xbt_dynar_t i1, } +extern "C" { + void reset_heap_information() { @@ -418,10 +421,10 @@ void reset_heap_information() static inline mc_mem_region_t MC_get_heap_region(mc_snapshot_t snapshot) { - size_t n = snapshot->snapshot_regions_count; + size_t n = snapshot->snapshot_regions.size(); for (size_t i=0; i!=n; ++i) { - mc_mem_region_t region = snapshot->snapshot_regions[i]; - if (region->region_type == MC_REGION_TYPE_HEAP) + mc_mem_region_t region = snapshot->snapshot_regions[i].get(); + if (region->region_type() == simgrid::mc::RegionType::Heap) return region; } xbt_die("No heap region"); @@ -429,7 +432,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 */ @@ -453,8 +456,10 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; // This is in snapshot do not use them directly: - const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer(snapshot1, heapinfo_address, MC_PROCESS_INDEX_MISSING); - const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer(snapshot2, heapinfo_address, MC_PROCESS_INDEX_MISSING); + const malloc_info* heapinfos1 = snapshot1->read( + (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); + const malloc_info* heapinfos2 = snapshot2->read( + (std::uint64_t)heapinfo_address, simgrid::mc::ProcessIndexMissing); while (i1 <= state->heaplimit) { @@ -504,7 +509,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (char *) state->std_heap_copy.heapbase; res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -543,7 +548,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) } res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_block1, addr_block2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_block1, addr_block2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -595,7 +600,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j1 << heapinfo2->type)); res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot1, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot1, snapshot2, NULL, NULL, 0); if (res_compare != 1) @@ -643,7 +648,7 @@ int mmalloc_compare_heap(mc_snapshot_t snapshot1, mc_snapshot_t snapshot2) (j2 << heapinfo2b->type)); res_compare = - compare_heap_area(MC_PROCESS_INDEX_MISSING, addr_frag1, addr_frag2, snapshot2, snapshot2, + compare_heap_area(simgrid::mc::ProcessIndexMissing, addr_frag1, addr_frag2, snapshot2, snapshot2, NULL, NULL, 0); if (res_compare != 1) { @@ -784,7 +789,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; @@ -818,13 +823,13 @@ 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 = MC_snapshot_read_pointer(snapshot1, (char *) real_area1 + pointer_align, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char *) real_area2 + pointer_align, process_index); + addr_pointed1 = snapshot1->read( + remote((void**)((char *) real_area1 + pointer_align)), process_index); + addr_pointed2 = snapshot2->read( + remote((void**)((char *) real_area2 + pointer_align)), process_index); - if (addr_pointed1 > process->maestro_stack_start - && addr_pointed1 < process->maestro_stack_end - && addr_pointed2 > process->maestro_stack_start - && addr_pointed2 < process->maestro_stack_end) { + 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 @@ -872,7 +877,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, dw_type_t type, + xbt_dynar_t previous, simgrid::mc::Type* type, int area_size, int check_ignore, int pointer_level) { @@ -890,11 +895,9 @@ top: return 0; } - dw_type_t subtype, subsubtype; + simgrid::mc::Type *subtype, *subsubtype; int res, elm_size; - unsigned int cursor = 0; - dw_type_t member; - const void *addr_pointed1, *addr_pointed2;; + const void *addr_pointed1, *addr_pointed2; mc_mem_region_t heap_region1 = MC_get_heap_region(snapshot1); mc_mem_region_t heap_region2 = MC_get_heap_region(snapshot2); @@ -904,7 +907,7 @@ top: return 1; case DW_TAG_base_type: - if (type->name != NULL && strcmp(type->name, "char") == 0) { /* String, hence random (arbitrary ?) size */ + if (!type->name.empty() && type->name == "char") { /* String, hence random (arbitrary ?) size */ if (real_area1 == real_area2) return -1; else @@ -978,15 +981,19 @@ top: case DW_TAG_rvalue_reference_type: case DW_TAG_pointer_type: if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { - addr_pointed1 = MC_snapshot_read_pointer(snapshot1, real_area1, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index); + 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 = MC_snapshot_read_pointer(snapshot1, (char*) real_area1 + i * sizeof(void *), process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, (char*) real_area2 + i * sizeof(void *), process_index); + 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 @@ -1001,8 +1008,8 @@ top: return res; } } else { - addr_pointed1 = MC_snapshot_read_pointer(snapshot1, real_area1, process_index); - addr_pointed2 = MC_snapshot_read_pointer(snapshot2, real_area2, process_index); + 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 @@ -1035,17 +1042,16 @@ top: return -1; } } else { - cursor = 0; - xbt_dynar_foreach(type->members, cursor, member) { + 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, - previous, member->subtype, -1, + previous, member.subtype, -1, check_ignore, 0); if (res == 1) { return res; @@ -1076,7 +1082,7 @@ top: * @param area_size * @return DWARF type ID for given offset */ -static dw_type_t get_offset_type(void *real_base_address, dw_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) { @@ -1097,20 +1103,18 @@ static dw_type_t get_offset_type(void *real_base_address, dw_type_t type, else return NULL; } else { - unsigned int cursor = 0; - dw_type_t member; - xbt_dynar_foreach(type->members, cursor, member) { + for(simgrid::mc::Type& member : type->members) { - if (!member->location.size) { + if (member.has_offset_location()) { // We have the offset, use it directly (shortcut): - if (member->offset == offset) - return member->subtype; + if (member.offset() == offset) + return member.subtype; } else { void *real_member = - mc_member_resolve(real_base_address, type, member, - (mc_address_space_t) snapshot, process_index); + mc_member_resolve(real_base_address, type, &member, + snapshot, process_index); if ((char*) real_member - (char *) real_base_address == offset) - return member->subtype; + return member.subtype; } } @@ -1137,9 +1141,9 @@ static dw_type_t get_offset_type(void *real_base_address, dw_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, - dw_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; @@ -1152,17 +1156,17 @@ 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; - dw_type_t new_type1 = NULL, new_type2 = NULL; + simgrid::mc::Type *new_type1 = NULL, *new_type2 = NULL; int match_pairs = 0; // This is the address of std_heap->heapinfo in the application process: void* heapinfo_address = &((xbt_mheap_t) process->heap_address)->heapinfo; - const malloc_info* heapinfos1 = (const malloc_info*) MC_snapshot_read_pointer( - snapshot1, heapinfo_address, process_index); - const malloc_info* heapinfos2 = (const malloc_info*) MC_snapshot_read_pointer( - snapshot2, heapinfo_address, process_index); + const malloc_info* heapinfos1 = snapshot1->read( + remote((const malloc_info**)heapinfo_address), process_index); + const malloc_info* heapinfos2 = snapshot2->read( + remote((const malloc_info**)heapinfo_address), process_index); malloc_info heapinfo_temp1, heapinfo_temp2; @@ -1216,8 +1220,8 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m // Find type_size: if ((type->type == DW_TAG_pointer_type) - || ((type->type == DW_TAG_base_type) && type->name != NULL - && (!strcmp(type->name, "char")))) + || ((type->type == DW_TAG_base_type) && !type->name.empty() + && type->name == "char")) type_size = -1; else type_size = type->byte_size; @@ -1265,7 +1269,7 @@ int compare_heap_area(int process_index, const void *area1, const void *area2, m if (type_size != -1) { if (type_size != (ssize_t) heapinfo1->busy_block.busy_size && type_size != (ssize_t) heapinfo2->busy_block.busy_size - && (type->name == NULL || !strcmp(type->name, "struct s_smx_context"))) { + && (type->name.empty() || type->name == "struct s_smx_context")) { if (match_pairs) { match_equals(state, previous); xbt_dynar_free(&previous); @@ -1566,27 +1570,6 @@ static int get_pointed_area_size(void *area, int heap) } } -// Not used: -char *get_type_description(mc_object_info_t info, char *type_name) -{ - - xbt_dict_cursor_t dict_cursor; - char *type_origin; - dw_type_t type; - - xbt_dict_foreach(info->types, dict_cursor, type_origin, type) { - if (type->name && (strcmp(type->name, type_name) == 0) - && type->byte_size > 0) { - xbt_dict_cursor_free(&dict_cursor); - return type_origin; - } - } - - xbt_dict_cursor_free(&dict_cursor); - return NULL; -} - - #ifndef max #define max( a, b ) ( ((a) > (b)) ? (a) : (b) ) #endif @@ -1610,7 +1593,7 @@ int mmalloc_linear_compare_heap(xbt_mheap_t heap1, xbt_mheap_t heap2) /* Heap information */ state->heaplimit = ((struct mdesc *) heap1)->heaplimit; - state->std_heap_copy = *MC_process_get_heap(&mc_model_checker->process); + state->std_heap_copy = *mc_model_checker->process().get_heap(); state->heapbase1 = (char *) heap1 + BLOCKSIZE; state->heapbase2 = (char *) heap2 + BLOCKSIZE;