extern "C" {
-static mc_mem_region_t mc_region_new_dense(
+static simgrid::mc::RegionSnapshot MC_region_dense(
mc_region_type_t region_type,
void *start_addr, void* permanent_addr, size_t size)
{
- mc_mem_region_t region = new simgrid::mc::RegionSnapshot();
- region->region_type = region_type;
- region->storage_type = MC_REGION_STORAGE_TYPE_FLAT;
- region->start_addr = start_addr;
- region->permanent_addr = permanent_addr;
- region->size = size;
- region->flat_data_.resize(size);
- mc_model_checker->process().read_bytes(region->flat_data_.data(), size,
+ std::vector<char> data(size);
+ mc_model_checker->process().read_bytes(data.data(), size,
remote(permanent_addr),
simgrid::mc::ProcessIndexDisabled);
+
+ simgrid::mc::RegionSnapshot region(
+ region_type, start_addr, permanent_addr, size);
+ 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 MC_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 MC_region_sparse(type, start_addr, permanent_addr, size);
} else {
- return mc_region_new_dense(type, start_addr, permanent_addr, size);
+ return MC_region_dense(type, start_addr, permanent_addr, size);
}
}
*/
static void MC_region_restore(mc_mem_region_t region)
{
- switch(region->storage_type) {
+ switch(region->storage_type()) {
case MC_REGION_STORAGE_TYPE_NONE:
default:
xbt_die("Storage type not supported");
break;
case MC_REGION_STORAGE_TYPE_FLAT:
- mc_model_checker->process().write_bytes(region->flat_data_.data(), region->size,
- remote(region->permanent_addr));
+ mc_model_checker->process().write_bytes(region->flat_data().data(),
+ region->size(), region->permanent_address());
break;
case MC_REGION_STORAGE_TYPE_CHUNKED:
break;
case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- for (auto const& p : region->privatized_regions_)
- 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(
+static simgrid::mc::RegionSnapshot MC_region_privatized(
mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
)
{
size_t process_count = MC_smpi_process_count();
- mc_mem_region_t region = new simgrid::mc::RegionSnapshot();
- region->region_type = region_type;
- region->storage_type = MC_REGION_STORAGE_TYPE_PRIVATIZED;
- region->start_addr = start_addr;
- region->permanent_addr = permanent_addr;
- region->size = size;
- region->privatized_regions_.resize(process_count);
// Read smpi_privatisation_regions from MCed:
smpi_privatisation_region_t remote_smpi_privatisation_regions;
&privatisation_regions, sizeof(privatisation_regions),
remote(remote_smpi_privatisation_regions));
- for (size_t i = 0; i < process_count; i++) {
- region->privatized_regions_[i] = std::unique_ptr<simgrid::mc::RegionSnapshot>(
- MC_region_new(region_type, start_addr,
+ std::vector<simgrid::mc::RegionSnapshot> data;
+ data.reserve(process_count);
+ for (size_t i = 0; i < process_count; i++)
+ data.push_back(
+ MC_region(region_type, start_addr,
privatisation_regions[i].address, size)
);
- }
- return region;
+ simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
+ region_type, start_addr, permanent_addr, size);
+ region.privatized_data(std::move(data));
+ return std::move(region);
}
static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
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 = 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;
}