X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/b81d0b9c9c365d2b195c8a189e2315adbdaa6af6..301989b17111d6a39df60385a4c2e73fcff8cd86:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index d3932f1f0c..ca498ee3fa 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -6,105 +6,75 @@ #define __STDC_FORMAT_MACROS #include -#include + +#include +#include #include -#include "internal_config.h" -#include "mc_dwarf.hpp" -#include "mc_safety.h" -#include "mc_liveness.h" -#include "mc_private.h" -#include "mc_smx.h" +#include "src/internal_config.h" +#include "src/mc/mc_safety.h" +#include "src/mc/mc_liveness.h" +#include "src/mc/mc_private.h" +#include "src/mc/mc_smx.h" +#include "src/mc/mc_dwarf.hpp" -#include "mc/Frame.hpp" -#include "mc/ObjectInformation.hpp" -#include "mc/Variable.hpp" +#include "src/mc/Frame.hpp" +#include "src/mc/ObjectInformation.hpp" +#include "src/mc/Variable.hpp" #ifdef HAVE_SMPI -#include "smpi/private.h" +#include "src/smpi/private.h" #endif #include "xbt/mmalloc.h" -#include "xbt/mmalloc/mmprivate.h" +#include "src/xbt/mmalloc/mmprivate.h" -#include +#include "src/xbt/probes.h" using simgrid::mc::remote; -typedef struct s_pointers_pair { - void *p1; - void *p2; - bool operator==(s_pointers_pair const& x) const { - return this->p1 == x.p1 && this->p2 == x.p2; - } - bool operator<(s_pointers_pair const& x) const { - return this->p1 < x.p1 || (this->p1 == x.p1 && this->p2 < x.p2); - } -} s_pointers_pair_t, *pointers_pair_t; - -namespace boost { - template<> - struct hash { - typedef uintptr_t result_type; - result_type operator()(s_pointers_pair const& x) const { - return (result_type) x.p1 ^ - ((result_type) x.p2 << 8 | (result_type) x.p2 >> (8*sizeof(uintptr_t) - 8)); - } - }; -} - -struct mc_compare_state { - boost::unordered_set compared_pointers; -}; - extern "C" { XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, xbt, "Logging specific to mc_compare in mc"); -/************************** Free functions ****************************/ -/********************************************************************/ +} + +namespace simgrid { +namespace mc { -static void stack_region_free(stack_region_t s) -{ - if (s) { - xbt_free(s); +/** A hash which works with more stuff + * + * It can hash pairs: the standard hash currently doesn't include this. + */ +template struct hash : public std::hash {}; + +template +struct hash> { + std::size_t operator()(std::pairconst& x) const + { + struct hash h1; + struct hash h2; + return h1(x.first) ^ h2(x.second); } -} +}; -static void stack_region_free_voidp(void *s) -{ - stack_region_free((stack_region_t) * (void **) s); -} +struct ComparisonState { + std::unordered_set, hash>> compared_pointers; +}; -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); } +using simgrid::mc::ComparisonState; + +extern "C" { + /************************** Snapshot comparison *******************************/ /******************************************************************************/ -/** \brief Try to add a pair a compared pointers to the set of compared pointers - * - * \result !=0 if the pointers were added (they were not in the set), - * 0 otherwise (they were already in the set) - */ -static int add_compared_pointers(mc_compare_state& state, void *p1, void *p2) -{ - s_pointers_pair_t new_pair; - new_pair.p1 = p1; - new_pair.p2 = p2; - return state.compared_pointers.insert(new_pair).second ? 1 : 0; -} - -static int compare_areas_with_type(struct mc_compare_state& state, +static int compare_areas_with_type(ComparisonState& 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, @@ -190,7 +160,8 @@ static int compare_areas_with_type(struct mc_compare_state& state, return 0; if (addr_pointed1 == NULL || addr_pointed2 == NULL) return 1; - if (!add_compared_pointers(state, addr_pointed1, addr_pointed2)) + if (!state.compared_pointers.insert( + std::make_pair(addr_pointed1, addr_pointed2)).second) return 0; pointer_level++; @@ -236,18 +207,18 @@ static int compare_areas_with_type(struct mc_compare_state& state, } case DW_TAG_structure_type: case DW_TAG_class_type: - for(simgrid::mc::Type& member : type->members) { - void *member1 = - mc_member_resolve(real_area1, type, &member, snapshot1, process_index); - void *member2 = - mc_member_resolve(real_area2, type, &member, 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; } @@ -297,7 +268,7 @@ static int compare_global_variables(simgrid::mc::ObjectInformation* object_info, #endif xbt_assert(r2->storage_type() != simgrid::mc::StorageType::Privatized); - struct mc_compare_state state; + ComparisonState state; std::vector& variables = object_info->global_variables; @@ -336,7 +307,7 @@ static int compare_local_variables(int process_index, mc_snapshot_stack_t stack1, mc_snapshot_stack_t stack2) { - struct mc_compare_state state; + ComparisonState state; if (stack1->local_variables.size() != stack2->local_variables.size()) { XBT_VERB("Different number of local variables"); @@ -349,7 +320,7 @@ static int compare_local_variables(int process_index, 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->subprogram != current_var2->subprogram || current_var1->ip != current_var2->ip) { // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram XBT_VERB @@ -416,15 +387,6 @@ int snapshot_compare(void *state1, void *state2) int errors = 0; int res_init; - xbt_os_timer_t global_timer = xbt_os_timer_new(); - xbt_os_timer_t timer = xbt_os_timer_new(); - - xbt_os_walltimer_start(global_timer); - -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif - int hash_result = 0; if (_sg_mc_hash) { hash_result = (s1->hash != s2->hash); @@ -457,11 +419,6 @@ int snapshot_compare(void *state1, void *state2) size_used2 = s2->stack_sizes[i]; if (size_used1 != size_used2) { #ifdef MC_DEBUG - if (is_diff == 0) { - xbt_os_walltimer_stop(timer); - mc_comp_times->stacks_sizes_comparison_time = - xbt_os_timer_elapsed(timer); - } XBT_DEBUG("(%d - %d) Different size used in stacks : %zu - %zu", num1, num2, size_used1, size_used2); errors++; @@ -472,34 +429,21 @@ int snapshot_compare(void *state1, void *state2) 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); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } i++; } -#ifdef MC_DEBUG - if (is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); -#endif - /* Init heap information used in heap comparison algorithm */ 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); + simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::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); + simgrid::mc::ProcessIndexMissing, simgrid::mc::ReadOptions::lazy()); res_init = init_heap_information(heap1, heap2, &s1->to_ignore, &s2->to_ignore); if (res_init == -1) { #ifdef MC_DEBUG @@ -511,16 +455,9 @@ int snapshot_compare(void *state1, void *state2) XBT_VERB("(%d - %d) Different heap information", num1, num2); #endif - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif /* Stacks comparison */ unsigned cursor = 0; @@ -531,7 +468,7 @@ int snapshot_compare(void *state1, void *state2) mc_snapshot_stack_t stack1, stack2; while (cursor < s1->stacks.size()) { stack1 = &s1->stacks[cursor]; - stack2 = &s1->stacks[cursor]; + stack2 = &s2->stacks[cursor]; if (stack1->process_index != stack2->process_index) { diff_local = 1; @@ -543,10 +480,6 @@ int snapshot_compare(void *state1, void *state2) 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); - mc_comp_times->stacks_comparison_time = xbt_os_timer_elapsed(timer); - } XBT_DEBUG("(%d - %d) Different local variables between stacks %d", num1, num2, cursor + 1); errors++; @@ -559,11 +492,6 @@ int snapshot_compare(void *state1, void *state2) #endif reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); return 1; #endif @@ -575,8 +503,6 @@ int snapshot_compare(void *state1, void *state2) // TODO, raise a difference instead? 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].get(); mc_mem_region_t region2 = s2->snapshot_regions[k].get(); @@ -591,24 +517,16 @@ int snapshot_compare(void *state1, void *state2) std::string const& name = region1->object_info()->file_name; -#ifdef MC_DEBUG - if (is_diff == 0) - xbt_os_walltimer_stop(timer); - xbt_os_walltimer_start(timer); -#endif - /* Compare global variables */ is_diff = - compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal, + compare_global_variables(region1->object_info(), + simgrid::mc::ProcessIndexDisabled, 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); - 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++; @@ -618,29 +536,16 @@ int snapshot_compare(void *state1, void *state2) num1, num2, name.c_str()); #endif - reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; #endif } } -#ifdef MC_DEBUG - xbt_os_walltimer_start(timer); -#endif - /* 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); - mc_comp_times->heap_comparison_time = xbt_os_timer_elapsed(timer); XBT_DEBUG("(%d - %d) Different heap (mmalloc_compare)", num1, num2); errors++; #else @@ -649,37 +554,12 @@ int snapshot_compare(void *state1, void *state2) XBT_VERB("(%d - %d) Different heap (mmalloc_compare)", num1, num2); #endif - reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); - xbt_os_timer_free(global_timer); - return 1; -#endif - } else { -#ifdef MC_DEBUG - xbt_os_walltimer_stop(timer); #endif } reset_heap_information(); - xbt_os_walltimer_stop(timer); - xbt_os_timer_free(timer); - -#ifdef MC_VERBOSE - xbt_os_walltimer_stop(global_timer); - mc_snapshot_comparison_time = xbt_os_timer_elapsed(global_timer); -#endif - - xbt_os_timer_free(global_timer); - -#ifdef MC_DEBUG - print_comparison_times(); -#endif - #ifdef MC_VERBOSE if (errors || hash_result) XBT_VERB("(%d - %d) Difference found", num1, num2); @@ -702,18 +582,4 @@ int snapshot_compare(void *state1, void *state2) } -/***************************** Statistics *****************************/ -/*******************************************************************/ - -void print_comparison_times() -{ - XBT_DEBUG("*** 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("- 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); -} - }