X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/d13b1659a0c2551ee41b287a269e391bb2d7bc8a..7f80c96356063a741966f244c8d00eaaf6f17fc0:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 1cfbd3c1d1..6bf43b370c 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -5,7 +5,7 @@ * under the terms of the license (GNU LGPL) which comes with this package. */ #define __STDC_FORMAT_MACROS -#include +#include #include #include @@ -26,6 +26,8 @@ #include +using simgrid::mc::remote; + typedef struct s_pointers_pair { void *p1; void *p2; @@ -206,8 +208,8 @@ 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) return (addr_pointed1 != addr_pointed2); @@ -232,9 +234,9 @@ static int compare_areas_with_type(struct mc_compare_state& state, 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); + mc_member_resolve(real_area1, type, member, snapshot1, process_index); void *member2 = - mc_member_resolve(real_area2, type, member, (mc_address_space_t) snapshot2, process_index); + mc_member_resolve(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 = @@ -266,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() == 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; @@ -350,13 +353,13 @@ static int compare_local_variables(int process_index, 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 + 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->name.c_str(), current_var2->name.c_str(), current_var1->subprogram->name, current_var2->subprogram->name, current_var1->ip, current_var2->ip); return 1; @@ -375,7 +378,7 @@ static int compare_local_variables(int process_index, 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->name.c_str(), current_var1->address, current_var2->address, current_var1->subprogram->name); return res; } @@ -437,14 +440,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; @@ -492,15 +491,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,7 +522,7 @@ 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; @@ -575,26 +574,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; + const char* name = region1->object_info()->file_name; #ifdef MC_DEBUG if (is_diff == 0) @@ -604,7 +602,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);