X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/ef6f2ce6c7e898f90da6f5415d08a0e87c6853ba..970087a9908d92cd6b234e84582771e4f4f25ceb:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 9a573169b1..65ec2a3100 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -1,20 +1,37 @@ -/* 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 + +#include "internal_config.h" +#include "mc_object_info.h" +#include "mc_safety.h" +#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" +#endif #include "xbt/mmalloc.h" #include "xbt/mmalloc/mmprivate.h" -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, - "Logging specific to mc_compare"); +#include + +using simgrid::mc::remote; typedef struct s_pointers_pair { void *p1; @@ -44,32 +61,24 @@ struct mc_compare_state { extern "C" { +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, + "Logging specific to mc_compare in mc"); + /************************** Free functions ****************************/ /********************************************************************/ static void stack_region_free(stack_region_t s) { if (s) { - xbt_free(s->process_name); xbt_free(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 *******************************/ /******************************************************************************/ @@ -87,12 +96,15 @@ static int add_compared_pointers(mc_compare_state& state, void *p1, void *p2) } 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) { - unsigned int cursor = 0; - dw_type_t member, subtype, subsubtype; + simgrid::mc::Process* process = &mc_model_checker->process(); + + simgrid::mc::Type* subtype; + simgrid::mc::Type* subsubtype; int elm_size, i, res; top: @@ -104,12 +116,9 @@ static int compare_areas_with_type(struct mc_compare_state& state, case DW_TAG_enumeration_type: case DW_TAG_union_type: { - void* data1 = - mc_snapshot_read_region(real_area1, region1, alloca(type->byte_size), type->byte_size); - void* data2 = - mc_snapshot_read_region(real_area2, region2, alloca(type->byte_size), type->byte_size); - return (memcmp(data1, data2, type->byte_size) != 0); - break; + return MC_snapshot_region_memcmp( + real_area1, region1, real_area2, region2, + type->byte_size) != 0; } case DW_TAG_typedef: case DW_TAG_volatile_type: @@ -149,7 +158,7 @@ static int compare_areas_with_type(struct mc_compare_state& state, } for (i = 0; i < type->element_count; i++) { size_t off = i * elm_size; - res = compare_areas_with_type(state, + res = compare_areas_with_type(state, process_index, (char*) real_area1 + off, snapshot1, region1, (char*) real_area2 + off, snapshot2, region2, type->subtype, pointer_level); @@ -161,9 +170,8 @@ static int compare_areas_with_type(struct mc_compare_state& state, case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: { - void* temp; - void* addr_pointed1 = *(void**) mc_snapshot_read_region(real_area1, region1, &temp, sizeof(void**)); - void* addr_pointed2 = *(void**) mc_snapshot_read_region(real_area2, region2, &temp, sizeof(void**)); + void* addr_pointed1 = MC_region_read_pointer(region1, real_area1); + void* addr_pointed2 = MC_region_read_pointer(region2, real_area2); if (type->subtype && type->subtype->type == DW_TAG_subroutine_type) { return (addr_pointed1 != addr_pointed2); @@ -183,33 +191,34 @@ static int compare_areas_with_type(struct mc_compare_state& state, // * a pointer leads to the read-only segment of the current object; // * a pointer lead to a different ELF object. - if (addr_pointed1 > std_heap + if (addr_pointed1 > process->heap_address && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)) { if (! - (addr_pointed2 > std_heap + (addr_pointed2 > process->heap_address && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))) return 1; // The pointers are both in the heap: - return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, + return compare_heap_area(process_index, addr_pointed1, addr_pointed2, snapshot1, snapshot2, NULL, type->subtype, pointer_level); } + // The pointers are both in the current object R/W segment: - else if (addr_pointed1 > region1->start_addr - && (char *) addr_pointed1 <= (char *) region1->start_addr + region1->size) { - if (! - (addr_pointed2 > region2->start_addr - && (char *) addr_pointed2 <= (char *) region2->start_addr + region2->size)) + 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, + return compare_areas_with_type(state, process_index, addr_pointed1, snapshot1, region1, addr_pointed2, snapshot2, region2, type->subtype, pointer_level); } } + // TODO, We do not handle very well the case where + // it belongs to a different (non-heap) region from the current one. + else { return (addr_pointed1 != addr_pointed2); } @@ -218,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, snapshot1); - void *member2 = - mc_member_resolve(real_area2, type, member, snapshot2); - mc_mem_region_t subregion1 = mc_get_region_hinted(member1, snapshot1, region1); - mc_mem_region_t subregion2 = mc_get_region_hinted(member2, snapshot2, region2); + 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, + 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; } @@ -245,44 +254,64 @@ static int compare_areas_with_type(struct mc_compare_state& state, return 0; } -static int compare_global_variables(int region_type, mc_mem_region_t r1, +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, mc_snapshot_t snapshot2) { xbt_assert(r1 && r2, "Missing region."); - struct mc_compare_state state; - xbt_dynar_t variables; - int res; - unsigned int cursor = 0; - dw_variable_t current_var; +#ifdef HAVE_SMPI + if (r1->storage_type() == simgrid::mc::StorageType::Privatized) { + xbt_assert(process_index >= 0); + if (r2->storage_type() != simgrid::mc::StorageType::Privatized) { + return 1; + } - mc_object_info_t object_info = NULL; - if (region_type == 2) { - object_info = mc_binary_info; - } else { - object_info = mc_libsimgrid_info; + size_t process_count = MC_smpi_process_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_data()[process_index], + &r2->privatized_data()[process_index], + snapshot1, snapshot2); + if (is_diff) return 1; + } + return 0; } - variables = object_info->global_variables; +#else + xbt_assert(r1->storage_type() != simgrid::mc::StorageType::Privatized); +#endif + xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized); + + struct mc_compare_state state; - xbt_dynar_foreach(variables, cursor, current_var) { + std::vector& variables = object_info->global_variables; + + 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 = - compare_areas_with_type(state, - (char *) current_var->address, snapshot1, r1, - (char *) current_var->address, snapshot2, r2, + 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, 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; } @@ -292,54 +321,57 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, } -static int compare_local_variables(mc_snapshot_t snapshot1, +static int compare_local_variables(int process_index, + mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, mc_snapshot_stack_t stack1, mc_snapshot_stack_t stack2) { 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, - current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1), - current_var2->address, snapshot2, mc_get_snapshot_region(current_var2->address, snapshot2), + compare_areas_with_type(state, process_index, + current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1, process_index), + current_var2->address, snapshot2, mc_get_snapshot_region(current_var2->address, snapshot2, process_index), subtype, 0); if (res == 1) { // 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++; @@ -350,6 +382,7 @@ static int compare_local_variables(mc_snapshot_t snapshot1, int snapshot_compare(void *state1, void *state2) { + simgrid::mc::Process* process = &mc_model_checker->process(); mc_snapshot_t s1, s2; int num1, num2; @@ -359,6 +392,11 @@ int snapshot_compare(void *state1, void *state2) s2 = ((mc_visited_pair_t) state2)->graph_state->system_state; num1 = ((mc_visited_pair_t) state1)->num; num2 = ((mc_visited_pair_t) state2)->num; + }else if (_sg_mc_termination) { /* Non-progressive cycle MC */ + s1 = ((mc_state_t) state1)->system_state; + s2 = ((mc_state_t) state2)->system_state; + num1 = ((mc_state_t) state1)->num; + num2 = ((mc_state_t) state2)->num; } else { /* Safety or comm determinism MC */ s1 = ((mc_visited_state_t) state1)->system_state; s2 = ((mc_visited_state_t) state2)->system_state; @@ -382,6 +420,7 @@ int snapshot_compare(void *state1, void *state2) if (_sg_mc_hash) { hash_result = (s1->hash != s2->hash); if (hash_result) { + XBT_TRACE2(mc, hash_diff, num1, num2); XBT_VERB("(%d - %d) Different hash : 0x%" PRIx64 "--0x%" PRIx64, num1, num2, s1->hash, s2->hash); #ifndef MC_DEBUG @@ -393,11 +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; @@ -405,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) { @@ -424,6 +462,7 @@ int snapshot_compare(void *state1, void *state2) XBT_VERB("(%d - %d) Different size used in stacks : %zu - %zu", num1, num2, size_used1, size_used2); #endif + XBT_TRACE3(mc, state_diff, num1, num2, "Different stack size"); xbt_os_walltimer_stop(timer); xbt_os_timer_free(timer); @@ -444,17 +483,22 @@ 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(std_heap, s1, - alloca(sizeof(struct mdesc)), sizeof(struct mdesc)); - xbt_mheap_t heap2 = (xbt_mheap_t) mc_snapshot_read(std_heap, s2, - alloca(sizeof(struct mdesc)), sizeof(struct mdesc)); - 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); errors++; #else #ifdef MC_VERBOSE + XBT_TRACE3(mc, state_diff, num1, num2, "Different heap information"); XBT_VERB("(%d - %d) Different heap information", num1, num2); #endif @@ -470,23 +514,25 @@ 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); - diff_local = - compare_local_variables(s1, s2, stack1, stack2); + while (cursor < s1->stacks.size()) { + stack1 = &s1->stacks[cursor]; + stack2 = &s1->stacks[cursor]; + + if (stack1->process_index != stack2->process_index) { + diff_local = 1; + XBT_DEBUG("(%d - %d) Stacks with different process index (%i vs %i)", num1, num2, + stack1->process_index, stack2->process_index); + } + else diff_local = + compare_local_variables(stack1->process_index, s1, s2, stack1, stack2); if (diff_local > 0) { + XBT_TRACE3(mc, state_diff, num1, num2, "Different local variables"); #ifdef MC_DEBUG if (is_diff == 0) { xbt_os_walltimer_stop(timer); @@ -516,19 +562,26 @@ int snapshot_compare(void *state1, void *state2) cursor++; } + size_t regions_count = s1->snapshot_regions.size(); + // TODO, raise a difference instead? + xbt_assert(regions_count == s2->snapshot_regions.size()); + mc_comp_times->global_variables_comparison_time = 0; - const char *names[3] = { "?", "libsimgrid", "binary" }; -#ifdef MC_DEBUG - double *times[3] = { - NULL, - &mc_comp_times->libsimgrid_global_variables_comparison_time, - &mc_comp_times->binary_global_variables_comparison_time - }; -#endif + for (size_t k = 0; k != regions_count; ++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() != 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()); + + std::string const& name = region1->object_info()->file_name; - int k = 0; - for (k = 2; k != 0; --k) { #ifdef MC_DEBUG if (is_diff == 0) xbt_os_walltimer_stop(timer); @@ -537,18 +590,23 @@ int snapshot_compare(void *state1, void *state2) /* Compare global variables */ is_diff = - compare_global_variables(k, s1->regions[k], s2->regions[k], s1, s2); + compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal, + region1, region2, + s1, s2); + if (is_diff != 0) { + XBT_TRACE3(mc, state_diff, num1, num2, "Different global variables"); #ifdef MC_DEBUG xbt_os_walltimer_stop(timer); - *times[k] = xbt_os_timer_elapsed(timer); - XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, - names[k]); + mc_comp_times->global_variables_comparison_time + += xbt_os_timer_elapsed(timer); + 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, - names[k]); + XBT_VERB("(%d - %d) Different global variables in %s", + num1, num2, name.c_str()); #endif reset_heap_information(); @@ -569,6 +627,7 @@ int snapshot_compare(void *state1, void *state2) /* Compare heap */ if (mmalloc_compare_heap(s1, s2) > 0) { + XBT_TRACE3(mc, state_diff, num1, num2, "Different heap"); #ifdef MC_DEBUG xbt_os_walltimer_stop(timer); @@ -643,28 +702,9 @@ void print_comparison_times() XBT_DEBUG("- Nb processes : %f", mc_comp_times->nb_processes_comparison_time); XBT_DEBUG("- Nb bytes used : %f", mc_comp_times->bytes_used_comparison_time); XBT_DEBUG("- Stacks sizes : %f", mc_comp_times->stacks_sizes_comparison_time); - XBT_DEBUG("- Binary global variables : %f", - mc_comp_times->binary_global_variables_comparison_time); - XBT_DEBUG("- Libsimgrid global variables : %f", - mc_comp_times->libsimgrid_global_variables_comparison_time); + XBT_DEBUG("- GLobal variables : %f", mc_comp_times->global_variables_comparison_time); XBT_DEBUG("- Heap : %f", mc_comp_times->heap_comparison_time); XBT_DEBUG("- Stacks : %f", mc_comp_times->stacks_comparison_time); } -/**************************** MC snapshot compare simcall **************************/ -/***********************************************************************************/ - -int SIMIX_pre_mc_compare_snapshots(smx_simcall_t simcall, - mc_snapshot_t s1, mc_snapshot_t s2) -{ - return snapshot_compare(s1, s2); -} - -int MC_compare_snapshots(void *s1, void *s2) -{ - - return simcall_mc_compare_snapshots(s1, s2); - -} - }