local_variable_free((local_variable_t) * (void **) v);
}
-void MC_region_destroy(mc_mem_region_t region)
-{
- if (!region)
- return;
- switch(region->storage_type) {
- case MC_REGION_STORAGE_TYPE_NONE:
- break;
- case MC_REGION_STORAGE_TYPE_FLAT:
- xbt_free(region->flat.data);
- break;
- case MC_REGION_STORAGE_TYPE_CHUNKED:
- mc_free_page_snapshot_region(region->chunked.page_numbers, mc_page_count(region->size));
- xbt_free(region->chunked.page_numbers);
- break;
- case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- {
- size_t regions_count = region->privatized.regions_count;
- for (size_t i=0; i!=regions_count; ++i) {
- MC_region_destroy(region->privatized.regions[i]);
- }
- free(region->privatized.regions);
- break;
- }
- }
- xbt_free(region);
-}
-
-/******************************* Snapshot regions ********************************/
-/*********************************************************************************/
-
-static mc_mem_region_t mc_region_new_dense(
- mc_region_type_t region_type,
- void *start_addr, void* permanent_addr, size_t size)
-{
- mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1);
- 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 = xbt_malloc(size);
- mc_model_checker->process().read_bytes(region->flat.data, size,
- remote(permanent_addr),
- simgrid::mc::ProcessIndexDisabled);
- XBT_DEBUG("New region : type : %d, data : %p (real addr %p), size : %zu",
- region_type, region->flat.data, permanent_addr, size);
- return region;
}
-/** @brief Take a snapshot of a given region
- *
- * @param type
- * @param start_addr Address of the region in the simulated process
- * @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(
- 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);
- } else {
- return mc_region_new_dense(type, start_addr, permanent_addr, size);
- }
-}
+extern "C" {
/** @brief Restore a region from a snapshot
*
*/
static void MC_region_restore(mc_mem_region_t region)
{
- switch(region->storage_type) {
- case MC_REGION_STORAGE_TYPE_NONE:
+ switch(region->storage_type()) {
+ case simgrid::mc::StorageType::NoData:
default:
xbt_die("Storage type not supported");
break;
- case MC_REGION_STORAGE_TYPE_FLAT:
- mc_model_checker->process().write_bytes(region->flat.data, region->size,
- remote(region->permanent_addr));
+ case simgrid::mc::StorageType::Flat:
+ mc_model_checker->process().write_bytes(region->flat_data().data(),
+ region->size(), region->permanent_address());
break;
- case MC_REGION_STORAGE_TYPE_CHUNKED:
+ case simgrid::mc::StorageType::Chunked:
mc_region_restore_sparse(&mc_model_checker->process(), region);
break;
- case MC_REGION_STORAGE_TYPE_PRIVATIZED:
- {
- size_t process_count = region->privatized.regions_count;
- for (size_t i = 0; i < process_count; i++) {
- MC_region_restore(region->privatized.regions[i]);
- }
- break;
- }
+ case simgrid::mc::StorageType::Privatized:
+ for (auto& p : region->privatized_data())
+ MC_region_restore(&p);
+ break;
}
}
-static mc_mem_region_t MC_region_new_privatized(
- mc_region_type_t region_type, void *start_addr, void* permanent_addr, size_t size
+}
+
+namespace simgrid {
+namespace mc {
+
+simgrid::mc::RegionSnapshot privatized_region(
+ RegionType region_type, void *start_addr, void* permanent_addr, size_t size
)
{
size_t process_count = MC_smpi_process_count();
- mc_mem_region_t region = xbt_new(s_mc_mem_region_t, 1);
- 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_count = process_count;
- region->privatized.regions = xbt_new(mc_mem_region_t, 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] =
- MC_region_new(region_type, start_addr,
- privatisation_regions[i].address, size);
- }
+ std::vector<simgrid::mc::RegionSnapshot> data;
+ data.reserve(process_count);
+ for (size_t i = 0; i < process_count; i++)
+ data.push_back(
+ simgrid::mc::region(region_type, start_addr,
+ privatisation_regions[i].address, size)
+ );
+
+ simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
+ region_type, start_addr, permanent_addr, size);
+ region.privatized_data(std::move(data));
+ return std::move(region);
+}
- return region;
+}
}
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_type_t type,
+extern "C" {
+
+static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
+ simgrid::mc::RegionType type,
mc_object_info_t object_info,
void *start_addr, void* permanent_addr, size_t size)
{
- if (type == MC_REGION_TYPE_DATA)
+ if (type == simgrid::mc::RegionType::Data)
xbt_assert(object_info, "Missing object info for object.");
- else if (type == MC_REGION_TYPE_HEAP)
+ else if (type == simgrid::mc::RegionType::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 = simgrid::mc::privatized_region(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;
}
for (size_t i = 0; i!=n; ++i) {
mc_object_info_t object_info = process->object_infos[i];
- MC_snapshot_add_region(i, snapshot, MC_REGION_TYPE_DATA, object_info,
+ MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data, object_info,
object_info->start_rw, object_info->start_rw,
object_info->end_rw - object_info->start_rw);
}
void *start_heap = heap->base;
void *end_heap = heap->breakval;
- MC_snapshot_add_region(n, snapshot, MC_REGION_TYPE_HEAP, NULL,
+ MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL,
start_heap, start_heap,
(char *) end_heap - (char *) start_heap);
snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote(
unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
xbt_dynar_push(res, &st);
- (*snapshot)->stack_sizes = (size_t*)
- xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
- (*snapshot)->stack_sizes[cursor] =
+ size_t stack_size =
(char*) current_stack->address + current_stack->size - (char*) sp;
+ (*snapshot)->stack_sizes.push_back(stack_size);
}
return res;
snapshot->process = mc_process;
snapshot->num_state = num_state;
- snapshot->enabled_processes = xbt_dynar_new(sizeof(int), NULL);
-
smx_process_t process;
MC_EACH_SIMIX_PROCESS(process,
- xbt_dynar_push_as(snapshot->enabled_processes, int, (int)process->pid));
+ snapshot->enabled_processes.insert(process->pid));
MC_snapshot_handle_ignore(snapshot);
