X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/26af220e017a088b56105b2f21fadecf7d6e2a88..970087a9908d92cd6b234e84582771e4f4f25ceb:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 1cfbd3c1d1..65ec2a3100 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -1,11 +1,11 @@ -/* Copyright (c) 2012-2014. The SimGrid Team. +/* Copyright (c) 2012-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. */ #define __STDC_FORMAT_MACROS -#include +#include #include #include @@ -16,6 +16,11 @@ #include "mc_liveness.h" #include "mc_private.h" #include "mc_smx.h" +#include "mc_dwarf.hpp" + +#include "mc/Frame.hpp" +#include "mc/ObjectInformation.hpp" +#include "mc/Variable.hpp" #ifdef HAVE_SMPI #include "smpi/private.h" @@ -26,6 +31,8 @@ #include +using simgrid::mc::remote; + typedef struct s_pointers_pair { void *p1; void *p2; @@ -67,21 +74,11 @@ static void stack_region_free(stack_region_t s) } } -static void stack_region_free_voidp(void *s) -{ - stack_region_free((stack_region_t) * (void **) s); -} - static void pointers_pair_free(pointers_pair_t p) { xbt_free(p); } -static void pointers_pair_free_voidp(void *p) -{ - pointers_pair_free((pointers_pair_t) * (void **) p); -} - /************************** Snapshot comparison *******************************/ /******************************************************************************/ @@ -102,12 +99,12 @@ static int compare_areas_with_type(struct mc_compare_state& state, int process_index, void* real_area1, mc_snapshot_t snapshot1, mc_mem_region_t region1, void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2, - 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(); - unsigned int cursor = 0; - dw_type_t member, subtype, subsubtype; + simgrid::mc::Type* subtype; + simgrid::mc::Type* subsubtype; int elm_size, i, res; top: @@ -206,10 +203,10 @@ static int compare_areas_with_type(struct mc_compare_state& state, } // The pointers are both in the current object R/W segment: - else if (mc_region_contain(region1, addr_pointed1)) { - if (!mc_region_contain(region2, addr_pointed2)) + else if (region1->contain(simgrid::mc::remote(addr_pointed1))) { + if (!region2->contain(simgrid::mc::remote(addr_pointed2))) return 1; - if (type->dw_type_id == NULL) + if (!type->type_id) return (addr_pointed1 != addr_pointed2); else { return compare_areas_with_type(state, process_index, @@ -230,18 +227,18 @@ static int compare_areas_with_type(struct mc_compare_state& state, } case DW_TAG_structure_type: case DW_TAG_class_type: - xbt_dynar_foreach(type->members, cursor, member) { - void *member1 = - mc_member_resolve(real_area1, type, member, (mc_address_space_t) snapshot1, process_index); - void *member2 = - mc_member_resolve(real_area2, type, member, (mc_address_space_t) snapshot2, process_index); + for(simgrid::mc::Member& member : type->members) { + void *member1 = simgrid::dwarf::resolve_member( + real_area1, type, &member, snapshot1, process_index); + void *member2 = simgrid::dwarf::resolve_member( + real_area2, type, &member, snapshot2, process_index); mc_mem_region_t subregion1 = mc_get_region_hinted(member1, snapshot1, process_index, region1); mc_mem_region_t subregion2 = mc_get_region_hinted(member2, snapshot2, process_index, region2); res = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2, subregion2, - member->subtype, pointer_level); + member.type, pointer_level); if (res == 1) return res; } @@ -257,7 +254,7 @@ static int compare_areas_with_type(struct mc_compare_state& state, return 0; } -static int compare_global_variables(mc_object_info_t object_info, +static int compare_global_variables(simgrid::mc::ObjectInformation* object_info, int process_index, mc_mem_region_t r1, mc_mem_region_t r2, mc_snapshot_t snapshot1, @@ -266,58 +263,55 @@ static int compare_global_variables(mc_object_info_t object_info, xbt_assert(r1 && r2, "Missing region."); #ifdef HAVE_SMPI - if (r1->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) { + if (r1->storage_type() == simgrid::mc::StorageType::Privatized) { xbt_assert(process_index >= 0); - if (r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED) { + if (r2->storage_type() != simgrid::mc::StorageType::Privatized) { return 1; } size_t process_count = MC_smpi_process_count(); - xbt_assert(process_count == r1->privatized.regions_count - && process_count == r2->privatized.regions_count); + xbt_assert(process_count == r1->privatized_data().size() + && process_count == r2->privatized_data().size()); // Compare the global variables separately for each simulates process: for (size_t process_index = 0; process_index < process_count; process_index++) { int is_diff = compare_global_variables(object_info, process_index, - r1->privatized.regions[process_index], r2->privatized.regions[process_index], + &r1->privatized_data()[process_index], + &r2->privatized_data()[process_index], snapshot1, snapshot2); if (is_diff) return 1; } return 0; } #else - xbt_assert(r1->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED); + xbt_assert(r1->storage_type() != simgrid::mc::StorageType::Privatized); #endif - xbt_assert(r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED); + xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized); struct mc_compare_state state; - xbt_dynar_t variables; - int res; - unsigned int cursor = 0; - dw_variable_t current_var; - - variables = object_info->global_variables; + std::vector& variables = object_info->global_variables; - xbt_dynar_foreach(variables, cursor, current_var) { + for (simgrid::mc::Variable& current_var : variables) { // If the variable is not in this object, skip it: // We do not expect to find a pointer to something which is not reachable // by the global variables. - if ((char *) current_var->address < (char *) object_info->start_rw - || (char *) current_var->address > (char *) object_info->end_rw) + if ((char *) current_var.address < (char *) object_info->start_rw + || (char *) current_var.address > (char *) object_info->end_rw) continue; - dw_type_t bvariable_type = current_var->type; - res = + simgrid::mc::Type* bvariable_type = current_var.type; + int res = compare_areas_with_type(state, process_index, - (char *) current_var->address, snapshot1, r1, - (char *) current_var->address, snapshot2, r2, + (char *) current_var.address, snapshot1, r1, + (char *) current_var.address, snapshot2, r2, bvariable_type, 0); if (res == 1) { XBT_TRACE3(mc, global_diff, -1, -1, current_var->name); XBT_VERB("Global variable %s (%p) is different between snapshots", - current_var->name, (char *) current_var->address); + current_var.name.c_str(), + (char *) current_var.address); return 1; } @@ -335,35 +329,33 @@ static int compare_local_variables(int process_index, { struct mc_compare_state state; - if (xbt_dynar_length(stack1->local_variables) != - xbt_dynar_length(stack2->local_variables)) { + if (stack1->local_variables.size() != stack2->local_variables.size()) { XBT_VERB("Different number of local variables"); return 1; } else { unsigned int cursor = 0; local_variable_t current_var1, current_var2; int res; - while (cursor < xbt_dynar_length(stack1->local_variables)) { - current_var1 = - (local_variable_t) xbt_dynar_get_as(stack1->local_variables, cursor, - local_variable_t); - current_var2 = - (local_variable_t) xbt_dynar_get_as(stack2->local_variables, cursor, - local_variable_t); - if (strcmp(current_var1->name, current_var2->name) != 0 + while (cursor < stack1->local_variables.size()) { + current_var1 = &stack1->local_variables[cursor]; + current_var2 = &stack1->local_variables[cursor]; + if (current_var1->name != current_var2->name || current_var1->subprogram != current_var1->subprogram || current_var1->ip != current_var2->ip) { // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram XBT_VERB - ("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)", - current_var1->name, current_var2->name, - current_var1->subprogram->name, current_var2->subprogram->name, + ("Different name of variable (%s - %s) " + "or frame (%s - %s) or ip (%lu - %lu)", + current_var1->name.c_str(), + current_var2->name.c_str(), + current_var1->subprogram->name.c_str(), + current_var2->subprogram->name.c_str(), current_var1->ip, current_var2->ip); return 1; } // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram - dw_type_t subtype = current_var1->type; + simgrid::mc::Type* subtype = current_var1->type; res = compare_areas_with_type(state, process_index, current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1, process_index), @@ -374,9 +366,12 @@ static int compare_local_variables(int process_index, // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram XBT_TRACE3(mc, local_diff, -1, -1, current_var1->name); XBT_VERB - ("Local variable %s (%p - %p) in frame %s is different between snapshots", - current_var1->name, current_var1->address, current_var2->address, - current_var1->subprogram->name); + ("Local variable %s (%p - %p) in frame %s " + "is different between snapshots", + current_var1->name.c_str(), + current_var1->address, + current_var2->address, + current_var1->subprogram->name.c_str()); return res; } cursor++; @@ -387,7 +382,7 @@ static int compare_local_variables(int process_index, int snapshot_compare(void *state1, void *state2) { - mc_process_t process = &mc_model_checker->process(); + simgrid::mc::Process* process = &mc_model_checker->process(); mc_snapshot_t s1, s2; int num1, num2; @@ -437,14 +432,10 @@ int snapshot_compare(void *state1, void *state2) } /* Compare enabled processes */ - unsigned int cursor; - int pid; - xbt_dynar_foreach(s1->enabled_processes, cursor, pid){ - if(!xbt_dynar_member(s2->enabled_processes, &pid)) { + if (s1->enabled_processes != s2->enabled_processes) { //XBT_TRACE3(mc, state_diff, num1, num2, "Different enabled processes"); XBT_VERB("(%d - %d) Different enabled processes", num1, num2); // return 1; ?? - } } unsigned long i = 0; @@ -452,7 +443,7 @@ int snapshot_compare(void *state1, void *state2) int is_diff = 0; /* Compare size of stacks */ - while (i < xbt_dynar_length(s1->stacks)) { + while (i < s1->stacks.size()) { size_used1 = s1->stack_sizes[i]; size_used2 = s2->stack_sizes[i]; if (size_used1 != size_used2) { @@ -492,15 +483,15 @@ int snapshot_compare(void *state1, void *state2) #endif /* Init heap information used in heap comparison algorithm */ - xbt_mheap_t heap1 = (xbt_mheap_t) MC_snapshot_read( - s1, MC_ADDRESS_SPACE_READ_FLAGS_LAZY, - alloca(sizeof(struct mdesc)), process->heap_address, sizeof(struct mdesc), - MC_PROCESS_INDEX_MISSING); - xbt_mheap_t heap2 = (xbt_mheap_t) MC_snapshot_read( - s2, MC_ADDRESS_SPACE_READ_FLAGS_LAZY, - alloca(sizeof(struct mdesc)), process->heap_address, sizeof(struct mdesc), - MC_PROCESS_INDEX_MISSING); - res_init = init_heap_information(heap1, heap2, s1->to_ignore, s2->to_ignore); + xbt_mheap_t heap1 = (xbt_mheap_t)s1->read_bytes( + alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + remote(process->heap_address), + simgrid::mc::ProcessIndexMissing, simgrid::mc::AddressSpace::Lazy); + xbt_mheap_t heap2 = (xbt_mheap_t)s2->read_bytes( + alloca(sizeof(struct mdesc)), sizeof(struct mdesc), + remote(process->heap_address), + simgrid::mc::ProcessIndexMissing, simgrid::mc::AddressSpace::Lazy); + res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore); if (res_init == -1) { #ifdef MC_DEBUG XBT_DEBUG("(%d - %d) Different heap information", num1, num2); @@ -523,19 +514,15 @@ int snapshot_compare(void *state1, void *state2) #endif /* Stacks comparison */ - cursor = 0; + unsigned cursor = 0; int diff_local = 0; #ifdef MC_DEBUG is_diff = 0; #endif mc_snapshot_stack_t stack1, stack2; - while (cursor < xbt_dynar_length(s1->stacks)) { - stack1 = - (mc_snapshot_stack_t) xbt_dynar_get_as(s1->stacks, cursor, - mc_snapshot_stack_t); - stack2 = - (mc_snapshot_stack_t) xbt_dynar_get_as(s2->stacks, cursor, - mc_snapshot_stack_t); + while (cursor < s1->stacks.size()) { + stack1 = &s1->stacks[cursor]; + stack2 = &s1->stacks[cursor]; if (stack1->process_index != stack2->process_index) { diff_local = 1; @@ -575,26 +562,25 @@ int snapshot_compare(void *state1, void *state2) cursor++; } - size_t regions_count = s1->snapshot_regions_count; + size_t regions_count = s1->snapshot_regions.size(); // TODO, raise a difference instead? - xbt_assert(regions_count == s2->snapshot_regions_count); + xbt_assert(regions_count == s2->snapshot_regions.size()); mc_comp_times->global_variables_comparison_time = 0; for (size_t k = 0; k != regions_count; ++k) { - mc_mem_region_t region1 = s1->snapshot_regions[k]; - mc_mem_region_t region2 = s2->snapshot_regions[k]; + mc_mem_region_t region1 = s1->snapshot_regions[k].get(); + mc_mem_region_t region2 = s2->snapshot_regions[k].get(); // Preconditions: - if (region1->region_type != MC_REGION_TYPE_DATA) + if (region1->region_type() != simgrid::mc::RegionType::Data) continue; - xbt_assert(region1->region_type == region2->region_type); - xbt_assert(region1->object_info == region2->object_info); - - xbt_assert(region1->object_info); + xbt_assert(region1->region_type() == region2->region_type()); + xbt_assert(region1->object_info() == region2->object_info()); + xbt_assert(region1->object_info()); - const char* name = region1->object_info->file_name; + std::string const& name = region1->object_info()->file_name; #ifdef MC_DEBUG if (is_diff == 0) @@ -604,7 +590,7 @@ int snapshot_compare(void *state1, void *state2) /* Compare global variables */ is_diff = - compare_global_variables(region1->object_info, MC_ADDRESS_SPACE_READ_FLAGS_NONE, + compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal, region1, region2, s1, s2); @@ -614,13 +600,13 @@ int snapshot_compare(void *state1, void *state2) xbt_os_walltimer_stop(timer); mc_comp_times->global_variables_comparison_time += xbt_os_timer_elapsed(timer); - XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, - name); + XBT_DEBUG("(%d - %d) Different global variables in %s", + num1, num2, name.c_str()); errors++; #else #ifdef MC_VERBOSE - XBT_VERB("(%d - %d) Different global variables in %s", num1, num2, - name); + XBT_VERB("(%d - %d) Different global variables in %s", + num1, num2, name.c_str()); #endif reset_heap_information();