RegionSnapshot::~RegionSnapshot() {}
-}
-}
-
-/******************************* Snapshot regions ********************************/
-/*********************************************************************************/
-
-extern "C" {
-
-static mc_mem_region_t mc_region_new_dense(
+simgrid::mc::RegionSnapshot dense_region(
mc_region_type_t region_type,
void *start_addr, void* permanent_addr, size_t size)
{
remote(permanent_addr),
simgrid::mc::ProcessIndexDisabled);
- mc_mem_region_t region = new simgrid::mc::RegionSnapshot(
+ simgrid::mc::RegionSnapshot region(
region_type, start_addr, permanent_addr, size);
- region->flat_data(std::move(data));
+ region.flat_data(std::move(data));
XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu",
- region_type, region->flat_data().data(), permanent_addr, size);
- return region;
+ region_type, region.flat_data().data(), permanent_addr, size);
+ return std::move(region);
}
/** @brief Take a snapshot of a given region
* @param permanent_addr Permanent address of this data (for privatized variables, this is the virtual address of the privatized mapping)
* @param size Size of the data*
*/
-static mc_mem_region_t MC_region_new(
+static simgrid::mc::RegionSnapshot region(
mc_region_type_t type, void *start_addr, void* permanent_addr, size_t size)
{
if (_sg_mc_sparse_checkpoint) {
- return mc_region_new_sparse(type, start_addr, permanent_addr, size);
+ return sparse_region(type, start_addr, permanent_addr, size);
} else {
- return mc_region_new_dense(type, start_addr, permanent_addr, size);
+ return dense_region(type, start_addr, permanent_addr, size);
}
}
+simgrid::mc::RegionSnapshot sparse_region(mc_region_type_t region_type,
+ void *start_addr, void* permanent_addr, size_t size)
+{
+ mc_process_t process = &mc_model_checker->process();
+
+ xbt_assert((((uintptr_t)start_addr) & (xbt_pagesize-1)) == 0,
+ "Not at the beginning of a page");
+ xbt_assert((((uintptr_t)permanent_addr) & (xbt_pagesize-1)) == 0,
+ "Not at the beginning of a page");
+ size_t page_count = mc_page_count(size);
+
+ simgrid::mc::PerPageCopy page_data(mc_model_checker->page_store(), *process,
+ permanent_addr, page_count);
+
+ simgrid::mc::RegionSnapshot region(
+ region_type, start_addr, permanent_addr, size);
+ region.page_data(std::move(page_data));
+ return std::move(region);
+}
+
+}
+}
+
+extern "C" {
+
/** @brief Restore a region from a snapshot
*
* @param reg Target region
break;
case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- for (auto const& p : region->privatized_data())
- MC_region_restore(p.get());
+ for (auto& p : region->privatized_data())
+ MC_region_restore(&p);
break;
}
}
-static mc_mem_region_t MC_region_new_privatized(
+}
+
+namespace simgrid {
+namespace mc {
+
+simgrid::mc::RegionSnapshot privatized_region(
mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
)
{
&privatisation_regions, sizeof(privatisation_regions),
remote(remote_smpi_privatisation_regions));
- std::vector<std::unique_ptr<simgrid::mc::RegionSnapshot>> data;
+ std::vector<simgrid::mc::RegionSnapshot> data;
data.reserve(process_count);
for (size_t i = 0; i < process_count; i++)
- data.push_back(std::unique_ptr<simgrid::mc::RegionSnapshot>(
- MC_region_new(region_type, start_addr,
+ data.push_back(
+ simgrid::mc::region(region_type, start_addr,
privatisation_regions[i].address, size)
- ));
+ );
- mc_mem_region_t region = new simgrid::mc::RegionSnapshot(
+ simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
region_type, start_addr, permanent_addr, size);
- region->privatized_data(std::move(data));
- return region;
+ region.privatized_data(std::move(data));
+ return std::move(region);
+}
+
+}
}
+extern "C" {
+
static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
mc_object_info_t object_info,
void *start_addr, void* permanent_addr, size_t size)
else if (type == MC_REGION_TYPE_HEAP)
xbt_assert(!object_info, "Unexpected object info for heap region.");
- mc_mem_region_t region;
const bool privatization_aware = MC_object_info_is_privatized(object_info);
+
+ simgrid::mc::RegionSnapshot region;
if (privatization_aware && MC_smpi_process_count())
- region = MC_region_new_privatized(type, start_addr, permanent_addr, size);
+ region = MC_region_privatized(type, start_addr, permanent_addr, size);
else
- region = MC_region_new(type, start_addr, permanent_addr, size);
+ region = simgrid::mc::region(type, start_addr, permanent_addr, size);
- region->object_info(object_info);
- snapshot->snapshot_regions[index] = region;
+ region.object_info(object_info);
+ snapshot->snapshot_regions[index]
+ = new simgrid::mc::RegionSnapshot(std::move(region));
return;
}