X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/1ba8e265192b67c6903d48faeabe9e1d626bcd3d..7ff482a58a97696f01729ff004fdf643dbd7071f:/src/mc/mc_compare.c diff --git a/src/mc/mc_compare.c b/src/mc/mc_compare.c index 4bb3b2d1af..f1cbfa4246 100644 --- a/src/mc/mc_compare.c +++ b/src/mc/mc_compare.c @@ -9,6 +9,7 @@ #include "mc_private.h" #include "xbt/mmalloc.h" +#include "xbt/mmalloc/mmprivate.h" XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_compare, mc, "Logging specific to mc_compare"); @@ -99,11 +100,11 @@ static int add_compared_pointers(void *p1, void *p2){ return 1; } -static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, mc_object_info_t info, mc_object_info_t other_info, dw_type_t type, int region_size, int region_type, void *start_data, int pointer_level){ +static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snapshot1, mc_snapshot_t snapshot2, dw_type_t type, int region_size, int region_type, void *start_data, int pointer_level){ unsigned int cursor = 0; dw_type_t member, subtype, subsubtype; - int elm_size, i, res, switch_types = 0; + int elm_size, i, res; void *addr_pointed1, *addr_pointed2; switch(type->type){ @@ -118,7 +119,7 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps case DW_TAG_typedef: case DW_TAG_volatile_type: case DW_TAG_const_type: - return compare_areas_with_type(area1, area2, snapshot1, snapshot2, info, other_info, type->subtype, region_size, region_type, start_data, pointer_level); + return compare_areas_with_type(area1, area2, snapshot1, snapshot2, type->subtype, region_size, region_type, start_data, pointer_level); break; case DW_TAG_array_type: subtype = type->subtype; @@ -134,20 +135,16 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps case DW_TAG_structure_type: case DW_TAG_class_type: case DW_TAG_union_type: - if(subtype->byte_size == 0){ /*declaration of the type, need the complete description */ - subtype = subtype->other_object_same_type; - switch_types = 1; - } + if(subtype->full_type) + subtype = subtype->full_type; elm_size = subtype->byte_size; break; case DW_TAG_const_type: case DW_TAG_typedef: case DW_TAG_volatile_type: subsubtype = subtype->subtype; - if(subsubtype->byte_size == 0){ /*declaration of the type, need the complete description */ - subsubtype = subsubtype->other_object_same_type; - switch_types = 1; - } + if(subsubtype->full_type) + subsubtype = subsubtype->full_type; elm_size = subsubtype->byte_size; break; default : @@ -155,10 +152,7 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps break; } for(i=0; ielement_count; i++){ - if(switch_types) - res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), snapshot1, snapshot2, other_info, info, type->subtype, region_size, region_type, start_data, pointer_level); - else - res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), snapshot1, snapshot2, info, other_info, type->subtype, region_size, region_type, start_data, pointer_level); + res = compare_areas_with_type((char *)area1 + (i*elm_size), (char *)area2 + (i*elm_size), snapshot1, snapshot2, type->subtype, region_size, region_type, start_data, pointer_level); if(res == 1) return res; } @@ -166,13 +160,13 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps case DW_TAG_pointer_type: case DW_TAG_reference_type: case DW_TAG_rvalue_reference_type: + + addr_pointed1 = *((void **)(area1)); + addr_pointed2 = *((void **)(area2)); + if(type->subtype && type->subtype->type == DW_TAG_subroutine_type){ - addr_pointed1 = *((void **)(area1)); - addr_pointed2 = *((void **)(area2)); return (addr_pointed1 != addr_pointed2); }else{ - addr_pointed1 = *((void **)(area1)); - addr_pointed2 = *((void **)(area2)); if(addr_pointed1 == NULL && addr_pointed2 == NULL) return 0; @@ -186,11 +180,11 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps // * a pointer leads to the read-only segment of the current object; // * a pointer lead to a different ELF object. - // The pointers are both in the heap: - if(addr_pointed1 > std_heap && (char *)addr_pointed1 < (char*) std_heap + STD_HEAP_SIZE){ - if(!(addr_pointed2 > std_heap && (char *)addr_pointed2 < (char*) std_heap + STD_HEAP_SIZE)) + if(addr_pointed1 > std_heap && addr_pointed1 < mc_snapshot_get_heap_end(snapshot1)){ + if(!(addr_pointed2 > std_heap && addr_pointed2 < mc_snapshot_get_heap_end(snapshot2))) return 1; - return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, NULL, info, other_info, type->dw_type_id, pointer_level); + // The pointers are both in the heap: + return compare_heap_area(addr_pointed1, addr_pointed2, snapshot1, snapshot2, NULL, type->subtype, pointer_level); } // The pointers are both in the current object R/W segment: @@ -199,8 +193,12 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps return 1; if(type->dw_type_id == NULL) return (addr_pointed1 != addr_pointed2); - else - return compare_areas_with_type(addr_pointed1, addr_pointed2, snapshot1, snapshot2, info, other_info, type->subtype, region_size, region_type, start_data, pointer_level); + else { + void* translated_addr_pointer1 = mc_translate_address((uintptr_t)addr_pointed1, snapshot1); + void* translated_addr_pointer2 = mc_translate_address((uintptr_t)addr_pointed2, snapshot2); + return compare_areas_with_type( + translated_addr_pointer1, translated_addr_pointer2, snapshot1, snapshot2, type->subtype, region_size, region_type, start_data, pointer_level); + } } else{ @@ -214,7 +212,7 @@ static int compare_areas_with_type(void *area1, void *area2, mc_snapshot_t snaps XBT_DEBUG("Compare member %s", member->name); void* member1 = mc_member_snapshot_resolve(area1, type, member, snapshot1); void* member2 = mc_member_snapshot_resolve(area2, type, member, snapshot2); - res = compare_areas_with_type(member1, member2, snapshot1, snapshot2, info, other_info, member->subtype, region_size, region_type, start_data, pointer_level); + res = compare_areas_with_type(member1, member2, snapshot1, snapshot2, member->subtype, region_size, region_type, start_data, pointer_level); if(res == 1) return res; } @@ -248,14 +246,11 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ void* start_data_libsimgrid = mc_libsimgrid_info->start_rw; mc_object_info_t object_info = NULL; - mc_object_info_t other_object_info = NULL; if(region_type == 2){ object_info = mc_binary_info; - other_object_info = mc_libsimgrid_info; start_data = start_data_binary; }else{ object_info = mc_libsimgrid_info; - other_object_info = mc_binary_info; start_data = start_data_libsimgrid; } variables = object_info->global_variables; @@ -272,7 +267,7 @@ static int compare_global_variables(int region_type, mc_mem_region_t r1, mc_mem_ offset = (char *)current_var->address - (char *)object_info->start_rw; dw_type_t bvariable_type = current_var->type; - res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, snapshot1, snapshot2, object_info, other_object_info, bvariable_type, r1->size, region_type, start_data, 0); + res = compare_areas_with_type((char *)r1->data + offset, (char *)r2->data + offset, snapshot1, snapshot2, bvariable_type, r1->size, region_type, start_data, 0); if(res == 1){ XBT_VERB("Global variable %s (%p - %p) is different between snapshots", current_var->name, (char *)r1->data + offset, (char *)r2->data + offset); xbt_dynar_free(&compared_pointers); @@ -311,25 +306,28 @@ static int compare_local_variables(mc_snapshot_t snapshot1, mc_snapshot_t snapsh 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 || strcmp(current_var1->frame, current_var2->frame) != 0 || current_var1->ip != current_var2->ip){ + if(strcmp(current_var1->name, current_var2->name) != 0 || current_var1->subprogram != current_var1->subprogram || current_var1->ip != current_var2->ip){ xbt_dynar_free(&compared_pointers); - XBT_VERB("Different name of variable (%s - %s) or frame (%s - %s) or ip (%lu - %lu)", current_var1->name, current_var2->name, current_var1->frame, current_var2->frame, 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, current_var1->ip, current_var2->ip); return 1; } offset1 = (char *)current_var1->address - (char *)std_heap; offset2 = (char *)current_var2->address - (char *)std_heap; - XBT_DEBUG("Compare local variable %s of frame %s", current_var1->name, current_var1->frame); + // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram + XBT_DEBUG("Compare local variable %s of frame %s", current_var1->subprogram->name, current_var1->subprogram->name); if(current_var1->region == 1) { dw_type_t subtype = current_var1->type; - res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, snapshot1, snapshot2, mc_libsimgrid_info, mc_binary_info, subtype, 0, 1, start_data_libsimgrid, 0); + res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, snapshot1, snapshot2, subtype, 0, 1, start_data_libsimgrid, 0); } else { dw_type_t subtype = current_var2->type; - res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, snapshot1, snapshot2, mc_binary_info, mc_libsimgrid_info, subtype, 0, 2, start_data_binary, 0); + res = compare_areas_with_type( (char *)heap1 + offset1, (char *)heap2 + offset2, snapshot1, snapshot2, subtype, 0, 2, start_data_binary, 0); } if(res == 1){ - XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name,(char *)heap1 + offset1, (char *)heap2 + offset2, current_var1->frame); + // TODO, fix current_varX->subprogram->name to include name if DW_TAG_inlined_subprogram + XBT_VERB("Local variable %s (%p - %p) in frame %s is different between snapshots", current_var1->name,(char *)heap1 + offset1, (char *)heap2 + offset2, current_var1->subprogram->name); xbt_dynar_free(&compared_pointers); compared_pointers = NULL; return res; @@ -541,9 +539,7 @@ int snapshot_compare(void *state1, void *state2){ /* Compare heap */ if(mmalloc_compare_heap(s1, s2, (xbt_mheap_t)s1->regions[0]->data, - (xbt_mheap_t)s2->regions[0]->data, - mc_libsimgrid_info, - mc_binary_info) > 0){ + (xbt_mheap_t)s2->regions[0]->data) > 0){ #ifdef MC_DEBUG xbt_os_walltimer_stop(timer);