break;
case MC_REGION_STORAGE_TYPE_FLAT:
- MC_process_write(&mc_model_checker->process(), region->flat.data,
- region->permanent_addr, region->size);
+ mc_model_checker->process().write_bytes(region->flat.data, region->size,
+ remote(region->permanent_addr));
break;
case MC_REGION_STORAGE_TYPE_CHUNKED:
// Read smpi_privatisation_regions from MCed:
smpi_privatisation_region_t remote_smpi_privatisation_regions;
- MC_process_read_variable(&mc_model_checker->process(),
+ mc_model_checker->process().read_variable(
"smpi_privatisation_regions",
&remote_smpi_privatisation_regions, sizeof(remote_smpi_privatisation_regions));
s_smpi_privatisation_region_t privatisation_regions[process_count];
#ifdef HAVE_SMPI
if (smpi_privatize_global_variables && MC_smpi_process_count()) {
// snapshot->privatization_index = smpi_loaded_page
- MC_process_read_variable(&mc_model_checker->process(),
+ mc_model_checker->process().read_variable(
"smpi_loaded_page", &snapshot->privatization_index,
sizeof(snapshot->privatization_index));
} else
// TODO, use real addresses in frame_t instead of fixing it here
- dw_frame_t frame = MC_process_find_function(process, (void *) ip);
+ dw_frame_t frame = process->find_function(remote(ip));
stack_frame->frame = frame;
if (frame) {
snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
// Copy the memory:
- unsigned int cursor = 0;
- mc_checkpoint_ignore_region_t region;
- xbt_dynar_foreach (mc_model_checker->process().checkpoint_ignore, cursor, region) {
+ for (auto const& region : mc_model_checker->process().ignored_regions()) {
s_mc_snapshot_ignored_data_t ignored_data;
- ignored_data.start = region->addr;
- ignored_data.size = region->size;
- ignored_data.data = malloc(region->size);
+ ignored_data.start = (void*)region.addr;
+ ignored_data.size = region.size;
+ ignored_data.data = malloc(region.size);
// TODO, we should do this once per privatization segment:
snapshot->process->read_bytes(
- ignored_data.data, region->size, remote(region->addr),
+ ignored_data.data, region.size, remote(region.addr),
simgrid::mc::ProcessIndexDisabled);
xbt_dynar_push(snapshot->ignored_data, &ignored_data);
}
// Zero the memory:
- xbt_dynar_foreach (mc_model_checker->process().checkpoint_ignore, cursor, region) {
- MC_process_clear_memory(snapshot->process, region->addr, region->size);
+ for(auto const& region : mc_model_checker->process().ignored_regions()) {
+ snapshot->process->clear_bytes(remote(region.addr), region.size);
}
}
unsigned int cursor = 0;
s_mc_snapshot_ignored_data_t ignored_data;
xbt_dynar_foreach (snapshot->ignored_data, cursor, ignored_data) {
- MC_process_write(snapshot->process,
- ignored_data.data, ignored_data.start, ignored_data.size);
+ snapshot->process->write_bytes(ignored_data.data, ignored_data.size,
+ remote(ignored_data.start));
}
}