X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d929149dc5f210fc2599db0407351ba27ad3a2ec..928649fec04d89b678017ec4cadbc97e5ef901f5:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 2f7ce7ead0..d9af408dfa 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -5,14 +5,17 @@ * 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" #ifdef HAVE_SMPI #include "smpi/private.h" @@ -23,8 +26,7 @@ #include -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, - "Logging specific to mc_compare"); +using simgrid::mc::remote; typedef struct s_pointers_pair { void *p1; @@ -54,13 +56,15 @@ 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); } } @@ -102,7 +106,7 @@ static int compare_areas_with_type(struct mc_compare_state& state, void* real_area2, mc_snapshot_t snapshot2, mc_mem_region_t region2, dw_type_t type, int pointer_level) { - mc_process_t process = &mc_model_checker->process; + mc_process_t process = &mc_model_checker->process(); unsigned int cursor = 0; dw_type_t member, subtype, subsubtype; @@ -117,7 +121,7 @@ static int compare_areas_with_type(struct mc_compare_state& state, case DW_TAG_enumeration_type: case DW_TAG_union_type: { - return mc_snapshot_region_memcmp( + return MC_snapshot_region_memcmp( real_area1, region1, real_area2, region2, type->byte_size) != 0; } @@ -171,8 +175,8 @@ static int compare_areas_with_type(struct mc_compare_state& state, case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: { - void* addr_pointed1 = mc_snapshot_read_pointer_region(real_area1, region1); - void* addr_pointed2 = mc_snapshot_read_pointer_region(real_area2, region2); + 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); @@ -264,29 +268,30 @@ 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() == MC_REGION_STORAGE_TYPE_PRIVATIZED) { xbt_assert(process_index >= 0); - if (r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED) { + if (r2->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED) { return 1; } - size_t process_count = smpi_process_count(); - xbt_assert(process_count == r1->privatized.regions_count - && process_count == r2->privatized.regions_count); + 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.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() != MC_REGION_STORAGE_TYPE_PRIVATIZED); #endif - xbt_assert(r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED); + xbt_assert(r2->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED); struct mc_compare_state state; @@ -385,7 +390,7 @@ static int compare_local_variables(int process_index, int snapshot_compare(void *state1, void *state2) { - mc_process_t process = &mc_model_checker->process; + mc_process_t process = &mc_model_checker->process(); mc_snapshot_t s1, s2; int num1, num2; @@ -395,6 +400,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; @@ -485,10 +495,14 @@ 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(process->heap_address, s1, MC_NO_PROCESS_INDEX, - alloca(sizeof(struct mdesc)), sizeof(struct mdesc)); - xbt_mheap_t heap2 = (xbt_mheap_t) mc_snapshot_read(process->heap_address, s2, MC_NO_PROCESS_INDEX, - alloca(sizeof(struct mdesc)), sizeof(struct mdesc)); + 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 @@ -564,33 +578,26 @@ int snapshot_compare(void *state1, void *state2) cursor++; } - - - 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 - size_t regions_count = s1->snapshot_regions_count; // TODO, raise a difference instead? xbt_assert(regions_count == s2->snapshot_regions_count); + 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]; // Preconditions: - if (region1->region_type != MC_REGION_TYPE_DATA) + if (region1->region_type() != MC_REGION_TYPE_DATA) continue; - xbt_assert(region1->region_type == region2->region_type); - xbt_assert(region1->object_info == region2->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; - xbt_assert(region1->object_info); #ifdef MC_DEBUG if (is_diff == 0) xbt_os_walltimer_stop(timer); @@ -599,7 +606,7 @@ int snapshot_compare(void *state1, void *state2) /* Compare global variables */ is_diff = - compare_global_variables(region1->object_info, MC_NO_PROCESS_INDEX, + compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal, region1, region2, s1, s2); @@ -607,14 +614,15 @@ int snapshot_compare(void *state1, void *state2) 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); + mc_comp_times->global_variables_comparison_time + += xbt_os_timer_elapsed(timer); XBT_DEBUG("(%d - %d) Different global variables in %s", num1, num2, - names[k]); + name); errors++; #else #ifdef MC_VERBOSE XBT_VERB("(%d - %d) Different global variables in %s", num1, num2, - names[k]); + name); #endif reset_heap_information(); @@ -710,28 +718,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 simcall_HANDLER_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); - -} - }