}
// 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);
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;
}
// 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_data()[process_index].get(),
- r2->privatized_data()[process_index].get(),
+ &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;
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;
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;
}
}
/* 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;
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);
+ 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);
#endif
/* Stacks comparison */
- cursor = 0;
+ unsigned cursor = 0;
int diff_local = 0;
#ifdef MC_DEBUG
is_diff = 0;
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());