namespace simgrid {
namespace mc {
-RegionSnapshot dense_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+RegionSnapshot* dense_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
{
simgrid::mc::Buffer data = Buffer::malloc(size);
mc_model_checker->process().read_bytes(data.get(), size, remote(permanent_addr), simgrid::mc::ProcessIndexDisabled);
- simgrid::mc::RegionSnapshot region(region_type, start_addr, permanent_addr, size);
- region.flat_data(std::move(data));
+ simgrid::mc::RegionSnapshot* region = new RegionSnapshot(region_type, start_addr, permanent_addr, size);
+ region->flat_data(std::move(data));
XBT_DEBUG("New region : type : %s, data : %p (real addr %p), size : %zu",
(region_type == RegionType::Heap ? "Heap" : (region_type == RegionType::Data ? "Data" : "?")),
- region.flat_data().get(), permanent_addr, size);
+ region->flat_data().get(), permanent_addr, size);
return region;
}
* privatized mapping)
* @param size Size of the data*
*/
-RegionSnapshot region(RegionType type, void* start_addr, void* permanent_addr, size_t size)
+RegionSnapshot* region(RegionType type, void* start_addr, void* permanent_addr, size_t size)
{
if (_sg_mc_sparse_checkpoint)
return sparse_region(type, start_addr, permanent_addr, size);
return dense_region(type, start_addr, permanent_addr, size);
}
-RegionSnapshot sparse_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
+RegionSnapshot* sparse_region(RegionType region_type, void* start_addr, void* permanent_addr, size_t size)
{
simgrid::mc::RemoteClient* process = &mc_model_checker->process();
assert(process != nullptr);
simgrid::mc::ChunkedData page_data(mc_model_checker->page_store(), *process, RemotePtr<void>(permanent_addr),
page_count);
- simgrid::mc::RegionSnapshot region(region_type, start_addr, permanent_addr, size);
- region.page_data(std::move(page_data));
+ simgrid::mc::RegionSnapshot* region = new RegionSnapshot(region_type, start_addr, permanent_addr, size);
+ region->page_data(std::move(page_data));
return region;
}
bool contain(RemotePtr<void> p) const { return p >= start() && p < end(); }
};
-RegionSnapshot privatized_region(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size);
-RegionSnapshot dense_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
-RegionSnapshot sparse_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
-RegionSnapshot region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
+RegionSnapshot* privatized_region(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size);
+RegionSnapshot* dense_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
+RegionSnapshot* sparse_region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
+RegionSnapshot* region(RegionType type, void* start_addr, void* data_addr, std::size_t size);
} // namespace mc
} // namespace simgrid
}
#if HAVE_SMPI
-RegionSnapshot privatized_region(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size)
+RegionSnapshot* privatized_region(RegionType region_type, void* start_addr, void* permanent_addr, std::size_t size)
{
size_t process_count = MC_smpi_process_count();
data.reserve(process_count);
for (size_t i = 0; i < process_count; i++)
data.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(
- new RegionSnapshot(region(region_type, start_addr, privatization_regions[i].address, size))));
+ region(region_type, start_addr, privatization_regions[i].address, size)));
- RegionSnapshot reg = RegionSnapshot(region_type, start_addr, permanent_addr, size);
- reg.privatized_data(std::move(data));
+ RegionSnapshot* reg = new RegionSnapshot(region_type, start_addr, permanent_addr, size);
+ reg->privatized_data(std::move(data));
return reg;
}
#endif
else if (type == simgrid::mc::RegionType::Heap)
xbt_assert(not object_info, "Unexpected object info for heap region.");
- simgrid::mc::RegionSnapshot region;
+ simgrid::mc::RegionSnapshot* region;
#if HAVE_SMPI
const bool privatization_aware = object_info && mc_model_checker->process().privatized(*object_info);
if (privatization_aware && MC_smpi_process_count())
#endif
region = simgrid::mc::region(type, start_addr, permanent_addr, size);
- region.object_info(object_info);
- snapshot_regions_.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(new RegionSnapshot(std::move(region))));
+ region->object_info(object_info);
+ snapshot_regions_.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(std::move(region)));
}
const void* Snapshot::read_bytes(void* buffer, std::size_t size, RemotePtr<void> address, int process_index,
size_t size;
void* src;
void* dstn;
- RegionSnapshot region0;
- RegionSnapshot region;
+ RegionSnapshot* region0;
+ RegionSnapshot* region;
} prologue_return;
static prologue_return prologue(int n); // common to the below 5 fxs
static void read_whole_region();
// Init memory and take snapshots:
init_memory(source, byte_size);
- simgrid::mc::RegionSnapshot region0 =
+ 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);
}
- simgrid::mc::RegionSnapshot region =
+ simgrid::mc::RegionSnapshot* region =
simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, source, source, byte_size);
void* destination = mmap(nullptr, byte_size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
for (int n = 1; n != 32; ++n) {
prologue_return ret = prologue(n);
- const void* read = MC_region_read(&(ret.region), ret.dstn, ret.src, ret.size);
+ const void* read = MC_region_read(ret.region, ret.dstn, ret.src, ret.size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp(ret.src, read, ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
for (int j = 0; j != 100; ++j) {
size_t offset = rnd_engine() % ret.size;
size_t size = rnd_engine() % (ret.size - offset);
- const void* read = MC_region_read(&(ret.region), ret.dstn, (const char*)ret.src + offset, size);
+ const void* read = MC_region_read(ret.region, ret.dstn, (const char*)ret.src + offset, size);
INFO("Mismatch in MC_region_read()");
REQUIRE(not memcmp((char*)ret.src + offset, read, size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
prologue_return ret = prologue(n);
INFO("Unexpected match in MC_snapshot_region_memcmp() with previous snapshot");
- REQUIRE(MC_snapshot_region_memcmp(ret.src, &(ret.region0), ret.src, &(ret.region), ret.size));
+ REQUIRE(MC_snapshot_region_memcmp(ret.src, ret.region0, ret.src, ret.region, ret.size));
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
size_t size = rnd_engine() % (ret.size - offset);
INFO("Mismatch in MC_snapshot_region_memcmp()");
- REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, &(ret.region), (char*)ret.src + offset,
- &(ret.region), size));
+ REQUIRE(not MC_snapshot_region_memcmp((char*)ret.src + offset, ret.region, (char*)ret.src + offset, ret.region,
+ size));
}
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
}
prologue_return ret = prologue(1);
memcpy(ret.src, &mc_model_checker, sizeof(void*));
- simgrid::mc::RegionSnapshot region2 =
+ simgrid::mc::RegionSnapshot* region2 =
simgrid::mc::sparse_region(simgrid::mc::RegionType::Unknown, ret.src, ret.src, ret.size);
INFO("Mismtach in MC_region_read_pointer()");
- REQUIRE(MC_region_read_pointer(®ion2, ret.src) == mc_model_checker);
+ REQUIRE(MC_region_read_pointer(region2, ret.src) == mc_model_checker);
munmap(ret.dstn, ret.size);
munmap(ret.src, ret.size);
+ delete ret.region0;
+ delete ret.region;
}
/*************** End: class snap_test_helper *****************************/