X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/52f5862b6fa36444df90587234b36308bb645121..54b039b2cb830d851ebe173aaad0a2bbf3129174:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 081aeadf9e..f813c74688 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -73,71 +73,9 @@ static void local_variable_free_voidp(void *v) 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 * @@ -145,15 +83,15 @@ static mc_mem_region_t MC_region_new( */ 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, 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: @@ -161,29 +99,22 @@ static void MC_region_restore(mc_mem_region_t 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; - } + 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 ) { 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; @@ -195,15 +126,25 @@ static mc_mem_region_t MC_region_new_privatized( &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 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; +} } +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) @@ -213,15 +154,17 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, mc_region_ 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 = 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; } @@ -266,42 +209,39 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) * * `dl_iterate_phdr` would be more robust but would not work in cross-process. * */ -void MC_find_object_address(memory_map_t maps, mc_object_info_t result) +void MC_find_object_address(std::vector const& maps, mc_object_info_t result) { - ssize_t i = 0; - s_map_region_t reg; const char *name = basename(result->file_name); - while (i < maps->mapsize) { - reg = maps->regions[i]; - if (maps->regions[i].pathname == NULL - || strcmp(basename(maps->regions[i].pathname), name)) { + for (size_t i = 0; i < maps.size(); ++i) { + simgrid::mc::VmMap const& reg = maps[i]; + if (maps[i].pathname.empty() + || strcmp(basename(maps[i].pathname.c_str()), name)) { // Nothing to do } else if ((reg.prot & PROT_WRITE)) { xbt_assert(!result->start_rw, "Multiple read-write segments for %s, not supported", - maps->regions[i].pathname); + maps[i].pathname.c_str()); result->start_rw = (char*) reg.start_addr; result->end_rw = (char*) reg.end_addr; // .bss is usually after the .data: - s_map_region_t *next = &(maps->regions[i + 1]); - if (next->pathname == NULL && (next->prot & PROT_WRITE) - && next->start_addr == reg.end_addr) { - result->end_rw = (char*) maps->regions[i + 1].end_addr; + simgrid::mc::VmMap const& next = maps[i + 1]; + if (next.pathname.empty() && (next.prot & PROT_WRITE) + && next.start_addr == reg.end_addr) { + result->end_rw = (char*) maps[i + 1].end_addr; } } else if ((reg.prot & PROT_READ) && (reg.prot & PROT_EXEC)) { xbt_assert(!result->start_exec, "Multiple executable segments for %s, not supported", - maps->regions[i].pathname); + maps[i].pathname.c_str()); result->start_exec = (char*) reg.start_addr; result->end_exec = (char*) reg.end_addr; } else if ((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) { xbt_assert(!result->start_ro, "Multiple read only segments for %s, not supported", - maps->regions[i].pathname); + maps[i].pathname.c_str()); result->start_ro = (char*) reg.start_addr; result->end_ro = (char*) reg.end_addr; } - i++; } result->start = result->start_rw;