#include <xbt/probes.h>
+using simgrid::mc::remote;
+
typedef struct s_pointers_pair {
void *p1;
void *p2;
xbt_assert(r1 && r2, "Missing region.");
#ifdef HAVE_SMPI
- if (r1->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+ if (r1->storage_type() == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
xbt_assert(process_index >= 0);
- if (r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+ if (r2->storage_type() != MC_REGION_STORAGE_TYPE_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() != MC_REGION_STORAGE_TYPE_PRIVATIZED);
#endif
- xbt_assert(r2->storage_type != MC_REGION_STORAGE_TYPE_PRIVATIZED);
+ xbt_assert(r2->storage_type() != MC_REGION_STORAGE_TYPE_PRIVATIZED);
struct mc_compare_state state;
/* 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),
- (std::uint64_t)process->heap_address,
+ 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),
- (std::uint64_t)process->heap_address,
+ 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) {
mc_mem_region_t region2 = s2->snapshot_regions[k];
// Preconditions:
- if (region1->region_type != MC_REGION_TYPE_DATA)
+ if (region1->region_type() != MC_REGION_TYPE_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)
/* Compare global variables */
is_diff =
- compare_global_variables(region1->object_info, simgrid::mc::AddressSpace::Normal,
+ compare_global_variables(region1->object_info( ), simgrid::mc::AddressSpace::Normal,
region1, region2,
s1, s2);