X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cc1eb8c4e293f75ccddc257ebc44bfcd0883073e..0f86d3285f605e43ba3f845eb2f5ee2502b2aed4:/src/mc/mc_compare.cpp diff --git a/src/mc/mc_compare.cpp b/src/mc/mc_compare.cpp index 56b01f6a8e..abeb22dc37 100644 --- a/src/mc/mc_compare.cpp +++ b/src/mc/mc_compare.cpp @@ -104,12 +104,11 @@ 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) + mc_type_t type, int pointer_level) { mc_process_t process = &mc_model_checker->process(); - unsigned int cursor = 0; - dw_type_t member, subtype, subsubtype; + mc_type_t subtype, subsubtype; int elm_size, i, res; top: @@ -211,7 +210,7 @@ static int compare_areas_with_type(struct mc_compare_state& state, 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, process_index, @@ -232,18 +231,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) { + for(simgrid::mc::Type& member : type->members) { void *member1 = - mc_member_resolve(real_area1, type, member, snapshot1, process_index); + mc_member_resolve(real_area1, type, &member, snapshot1, process_index); void *member2 = - mc_member_resolve(real_area2, type, member, 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 = compare_areas_with_type(state, process_index, member1, snapshot1, subregion1, member2, snapshot2, subregion2, - member->subtype, pointer_level); + member.subtype, pointer_level); if (res == 1) return res; } @@ -295,32 +294,28 @@ static int compare_global_variables(mc_object_info_t object_info, struct mc_compare_state state; - xbt_dynar_t variables; - int res; - unsigned int cursor = 0; - dw_variable_t current_var; + std::vector& variables = object_info->global_variables; - variables = object_info->global_variables; - - xbt_dynar_foreach(variables, cursor, current_var) { + 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 = + mc_type_t 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, + (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; } @@ -338,35 +333,33 @@ static int compare_local_variables(int process_index, { 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; + mc_type_t subtype = current_var1->type; res = compare_areas_with_type(state, process_index, current_var1->address, snapshot1, mc_get_snapshot_region(current_var1->address, snapshot1, process_index), @@ -377,9 +370,12 @@ static int compare_local_variables(int process_index, // 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++; @@ -451,7 +447,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) { @@ -528,13 +524,9 @@ int snapshot_compare(void *state1, void *state2) 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); + while (cursor < s1->stacks.size()) { + stack1 = &s1->stacks[cursor]; + stack2 = &s1->stacks[cursor]; if (stack1->process_index != stack2->process_index) { diff_local = 1;