X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/eb417d0c8064e83fc1211abc819ae93687505003..a5768f8725f95079064178fcbb020eea94ae19b7:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index e05a59eba8..29a631822d 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,45 +83,38 @@ static mc_mem_region_t MC_region_new( */ 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; @@ -195,33 +126,46 @@ 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; +} } -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; } @@ -233,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); } @@ -242,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( @@ -266,42 +210,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; @@ -527,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; @@ -575,23 +515,21 @@ static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot) 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) { - snapshot->process->clear_bytes(remote(region->addr), region->size); + for(auto const& region : mc_model_checker->process().ignored_regions()) { + snapshot->process->clear_bytes(remote(region.addr), region.size); } } @@ -606,15 +544,12 @@ static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot) } } -static void MC_get_current_fd(mc_snapshot_t snapshot) +static std::vector MC_get_current_fds(pid_t pid) { - - snapshot->total_fd = 0; - const size_t fd_dir_path_size = 20; char fd_dir_path[fd_dir_path_size]; int res = snprintf(fd_dir_path, fd_dir_path_size, - "/proc/%lli/fd", (long long int) snapshot->process->pid); + "/proc/%lli/fd", (long long int) pid); xbt_assert(res >= 0); if ((size_t) res > fd_dir_path_size) xbt_die("Unexpected buffer is too small for fd_dir_path"); @@ -623,7 +558,8 @@ static void MC_get_current_fd(mc_snapshot_t snapshot) if (fd_dir == NULL) xbt_die("Cannot open directory '/proc/self/fd'\n"); - size_t total_fd = 0; + std::vector fds; + struct dirent* fd_number; while ((fd_number = readdir(fd_dir))) { @@ -635,7 +571,7 @@ static void MC_get_current_fd(mc_snapshot_t snapshot) const size_t source_size = 25; char source[25]; int res = snprintf(source, source_size, "/proc/%lli/fd/%s", - (long long int) snapshot->process->pid, fd_number->d_name); + (long long int) pid, fd_number->d_name); xbt_assert(res >= 0); if ((size_t) res > source_size) xbt_die("Unexpected buffer is too small for fd %s", fd_number->d_name); @@ -673,18 +609,16 @@ static void MC_get_current_fd(mc_snapshot_t snapshot) continue; // Add an entry for this FD in the snapshot: - fd_infos_t fd = xbt_new0(s_fd_infos_t, 1); - fd->filename = strdup(link); - fd->number = fd_value; - fd->flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ; - fd->current_position = lseek(fd_value, 0, SEEK_CUR); - snapshot->current_fd = (fd_infos_t*) xbt_realloc(snapshot->current_fd, (total_fd + 1) * sizeof(fd_infos_t)); - snapshot->current_fd[total_fd] = fd; - total_fd++; + s_fd_infos_t fd; + fd.filename = std::string(link); + fd.number = fd_value; + fd.flags = fcntl(fd_value, F_GETFL) | fcntl(fd_value, F_GETFD) ; + fd.current_position = lseek(fd_value, 0, SEEK_CUR); + fds.push_back(std::move(fd)); } - snapshot->total_fd = total_fd; closedir (fd_dir); + return std::move(fds); } mc_snapshot_t MC_take_snapshot(int num_state) @@ -698,16 +632,14 @@ 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); if (_sg_mc_snapshot_fds) - MC_get_current_fd(snapshot); + snapshot->current_fds = MC_get_current_fds(process->pid); /* Save the std heap and the writable mapped pages of libsimgrid and binary */ MC_get_memory_regions(mc_process, snapshot); @@ -760,20 +692,18 @@ void MC_restore_snapshot_fds(mc_snapshot_t snapshot) if (mc_mode == MC_MODE_SERVER) xbt_die("FD snapshot not implemented in client/server mode."); - int new_fd; - for (int i=0; i < snapshot->total_fd; i++) { + for (auto const& fd : snapshot->current_fds) { - new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags); - if (new_fd <0) { + int new_fd = open(fd.filename.c_str(), fd.flags); + if (new_fd < 0) { xbt_die("Could not reopen the file %s fo restoring the file descriptor", - snapshot->current_fd[i]->filename); + fd.filename.c_str()); } - if(new_fd != -1 && new_fd != snapshot->current_fd[i]->number){ - dup2(new_fd, snapshot->current_fd[i]->number); - //fprintf(stderr, "%p\n", fdopen(snapshot->current_fd[i]->number, "rw")); + if (new_fd != fd.number) { + dup2(new_fd, fd.number); close(new_fd); }; - lseek(snapshot->current_fd[i]->number, snapshot->current_fd[i]->current_position, SEEK_SET); + lseek(fd.number, fd.current_position, SEEK_SET); } }