mc_mem_region_t mc_get_snapshot_region(
const void* addr, const s_mc_snapshot_t* snapshot, int process_index)
{
- size_t n = snapshot->snapshot_regions_count;
+ size_t n = snapshot->snapshot_regions.size();
for (size_t i = 0; i != n; ++i) {
- mc_mem_region_t region = snapshot->snapshot_regions[i];
- if (!(region && mc_region_contain(region, addr)))
+ mc_mem_region_t region = snapshot->snapshot_regions[i].get();
+ if (!(region && region->contain(simgrid::mc::remote(addr))))
continue;
- if (region->storage_type == MC_REGION_STORAGE_TYPE_PRIVATIZED) {
+ if (region->storage_type() == simgrid::mc::StorageType::Privatized) {
#ifdef HAVE_SMPI
// Use the current process index of the snapshot:
if (process_index == simgrid::mc::ProcessIndexDisabled) {
if (process_index < 0) {
xbt_die("Missing process index");
}
- if (process_index >= (int) region->privatized.regions_count) {
+ if (process_index >= (int) region->privatized_data().size()) {
xbt_die("Invalid process index");
}
- mc_mem_region_t priv_region = region->privatized.regions[process_index];
- xbt_assert(mc_region_contain(priv_region, addr));
- return priv_region;
+ simgrid::mc::RegionSnapshot& priv_region = region->privatized_data()[process_index];
+ xbt_assert(priv_region.contain(simgrid::mc::remote(addr)));
+ return &priv_region;
#else
xbt_die("Privatized region in a non SMPI build (this should not happen)");
#endif
// Using alloca() for large allocations may trigger stack overflow:
// use malloc if the buffer is too big.
bool stack_alloc = size < 64;
- const bool region1_need_buffer = region1==NULL || region1->storage_type==MC_REGION_STORAGE_TYPE_FLAT;
- const bool region2_need_buffer = region2==NULL || region2->storage_type==MC_REGION_STORAGE_TYPE_FLAT;
+ const bool region1_need_buffer = region1==NULL || region1->storage_type()==simgrid::mc::StorageType::Flat;
+ const bool region2_need_buffer = region2==NULL || region2->storage_type()==simgrid::mc::StorageType::Flat;
void* buffer1a = region1_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
void* buffer2a = region2_need_buffer ? NULL : stack_alloc ? alloca(size) : malloc(size);
const void* buffer1 = MC_region_read(region1, buffer1a, addr1, size);
process(nullptr),
num_state(0),
heap_bytes_used(0),
- snapshot_regions(nullptr),
- snapshot_regions_count(0),
- enabled_processes(0),
+ enabled_processes(),
privatization_index(0),
- stack_sizes(nullptr),
- stacks(nullptr),
- to_ignore(nullptr),
- hash(0),
- ignored_data(nullptr),
- total_fd(0),
- current_fd(nullptr)
+ hash(0)
{
}
+
Snapshot::~Snapshot()
{
- for (size_t i = 0; i < this->snapshot_regions_count; i++) {
- MC_region_destroy(this->snapshot_regions[i]);
- }
- xbt_free(this->snapshot_regions);
- xbt_free(this->stack_sizes);
- xbt_dynar_free(&(this->stacks));
- xbt_dynar_free(&(this->to_ignore));
- xbt_dynar_free(&this->ignored_data);
+
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size,
// Init memory and take snapshots:
init_memory(source, byte_size);
- mc_mem_region_t region0 = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+ simgrid::mc::RegionSnapshot region0 = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size);
for(int i=0; i<n; i+=2) {
init_memory((char*) source + i*xbt_pagesize, xbt_pagesize);
}
- mc_mem_region_t region = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
+ simgrid::mc::RegionSnapshot region = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size);
void* destination = mmap(NULL, byte_size, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0);
xbt_assert(source!=MAP_FAILED, "Could not allocate destination memory");
xbt_test_add("Reading whole region data for %i page(s)", n);
- const void* read = MC_region_read(region, destination, source, byte_size);
+ const void* read = MC_region_read(®ion, destination, source, byte_size);
xbt_test_assert(!memcmp(source, read, byte_size), "Mismatch in MC_region_read()");
xbt_test_add("Reading parts of region data for %i page(s)", n);
for(int j=0; j!=100; ++j) {
size_t offset = rand() % byte_size;
size_t size = rand() % (byte_size - offset);
- const void* read = MC_region_read(region, destination, (const char*) source+offset, size);
+ const void* read = MC_region_read(®ion, destination, (const char*) source+offset, size);
xbt_test_assert(!memcmp((char*) source+offset, read, size),
"Mismatch in MC_region_read()");
}
xbt_test_add("Compare whole region data for %i page(s)", n);
- xbt_test_assert(!MC_snapshot_region_memcmp(source, NULL, source, region, byte_size),
- "Mismatch in MC_snapshot_region_memcmp() for the whole region");
- xbt_test_assert(MC_snapshot_region_memcmp(source, region0, source, region, byte_size),
- "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
- xbt_test_add("Compare parts of region data for %i page(s) with current value", n);
- for(int j=0; j!=100; ++j) {
- size_t offset = rand() % byte_size;
- size_t size = rand() % (byte_size - offset);
- xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, NULL, (char*) source+offset, region, size),
- "Mismatch in MC_snapshot_region_memcmp()");
- }
+ xbt_test_assert(MC_snapshot_region_memcmp(source, ®ion0, source, ®ion, byte_size),
+ "Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
xbt_test_add("Compare parts of region data for %i page(s) with itself", n);
for(int j=0; j!=100; ++j) {
size_t offset = rand() % byte_size;
size_t size = rand() % (byte_size - offset);
- xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, region, (char*) source+offset, region, size),
+ xbt_test_assert(!MC_snapshot_region_memcmp((char*) source+offset, ®ion, (char*) source+offset, ®ion, size),
"Mismatch in MC_snapshot_region_memcmp()");
}
if (n==1) {
xbt_test_add("Read pointer for %i page(s)", n);
memcpy(source, &mc_model_checker, sizeof(void*));
- mc_mem_region_t region2 = mc_region_new_sparse(
- MC_REGION_TYPE_UNKNOWN, source, source, byte_size);
- xbt_test_assert(MC_region_read_pointer(region2, source) == mc_model_checker,
+ simgrid::mc::RegionSnapshot region2 = simgrid::mc::sparse_region(
+ simgrid::mc::RegionType::Unknown, source, source, byte_size);
+ xbt_test_assert(MC_region_read_pointer(®ion2, source) == mc_model_checker,
"Mismtach in MC_region_read_pointer()");
- MC_region_destroy(region2);
}
- MC_region_destroy(region);
- MC_region_destroy(region0);
munmap(destination, byte_size);
munmap(source, byte_size);
}