X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/4ea83ea565b18593a9e6864b7e43d02fc8500f23..378d07947ce02213e465faf2dbbe1dd19a28095d:/src/mc/mc_checkpoint.cpp?ds=sidebyside diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 071caa8593..1ef983407c 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -75,84 +75,43 @@ static void local_variable_free_voidp(void *v) } -namespace simgrid { -namespace mc { - -RegionSnapshot::~RegionSnapshot() {} - -} -} - -/******************************* Snapshot regions ********************************/ -/*********************************************************************************/ - extern "C" { -static mc_mem_region_t mc_region_new_dense( - mc_region_type_t region_type, - void *start_addr, void* permanent_addr, size_t size) -{ - std::vector data(size); - mc_model_checker->process().read_bytes(data.data(), size, - remote(permanent_addr), - simgrid::mc::ProcessIndexDisabled); - - mc_mem_region_t region = new simgrid::mc::RegionSnapshot( - 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; -} - -/** @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); - } -} - /** @brief Restore a region from a snapshot * * @param reg Target region */ 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().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: - for (auto const& p : region->privatized_data()) - MC_region_restore(p.get()); + 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(); @@ -167,38 +126,46 @@ static mc_mem_region_t MC_region_new_privatized( &privatisation_regions, sizeof(privatisation_regions), remote(remote_smpi_privatisation_regions)); - std::vector> data; + std::vector data; data.reserve(process_count); for (size_t i = 0; i < process_count; i++) - data.push_back(std::unique_ptr( - 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); +} + +} } -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; } @@ -210,7 +177,7 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) 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); } @@ -219,7 +186,7 @@ static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) 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( @@ -501,10 +468,9 @@ static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot) 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; @@ -669,11 +635,9 @@ mc_snapshot_t MC_take_snapshot(int num_state) 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);