X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/bf23fe353d38f31a84d517a064eed072cd6197f1..b66d5e3048f03720a020e09f507db4d8a96a4798:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 9a1285bb78..559504af95 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -45,84 +45,29 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, /************************************ Free functions **************************************/ /*****************************************************************************************/ -static void MC_snapshot_stack_free(mc_snapshot_stack_t s) +s_mc_snapshot_stack::~s_mc_snapshot_stack() { - if (s) { - xbt_dynar_free(&(s->local_variables)); - xbt_dynar_free(&(s->stack_frames)); - mc_unw_destroy_context(s->context); - xbt_free(s->context); - xbt_free(s); - } + xbt_dynar_free(&(this->stack_frames)); + mc_unw_destroy_context(this->context); + xbt_free(this->context); } static void MC_snapshot_stack_free_voidp(void *s) { mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s; - MC_snapshot_stack_free(stack); -} - -static void local_variable_free(local_variable_t v) -{ - xbt_free(v->name); - xbt_free(v); + delete stack; } static void local_variable_free_voidp(void *v) { - local_variable_free((local_variable_t) * (void **) v); -} - + local_variable_t var = *(local_variable_t*)v; + delete var; } -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 @@ -130,29 +75,34 @@ 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: + case simgrid::mc::StorageType::NoData: default: xbt_die("Storage type not supported"); break; - case MC_REGION_STORAGE_TYPE_FLAT: + 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,50 +117,57 @@ 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] + = std::unique_ptr( + new simgrid::mc::RegionSnapshot(std::move(region))); return; } static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot) { const size_t n = process->object_infos_size; - snapshot->snapshot_regions_count = n + 1; - snapshot->snapshot_regions = xbt_new0(mc_mem_region_t, n + 1); - - for (size_t i = 0; i!=n; ++i) { + snapshot->snapshot_regions.resize(n + 1); + 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 +176,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( @@ -318,7 +275,8 @@ static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope, } static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, - dw_frame_t scope, int process_index, xbt_dynar_t result) + dw_frame_t scope, int process_index, + std::vector& result) { mc_process_t process = &mc_model_checker->process(); @@ -340,15 +298,16 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, else region_type = 2; - local_variable_t new_var = xbt_new0(s_local_variable_t, 1); - new_var->subprogram = stack_frame->frame; - new_var->ip = stack_frame->ip; - new_var->name = xbt_strdup(current_variable->name); - new_var->type = current_variable->type; - new_var->region = region_type; + s_local_variable_t new_var; + new_var.subprogram = stack_frame->frame; + new_var.ip = stack_frame->ip; + new_var.name = current_variable->name; + new_var.type = current_variable->type; + new_var.region = region_type; + new_var.address = nullptr; if (current_variable->address != NULL) { - new_var->address = current_variable->address; + new_var.address = current_variable->address; } else if (current_variable->locations.size != 0) { s_mc_location_t location; mc_dwarf_resolve_locations( @@ -360,7 +319,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, switch(mc_get_location_type(&location)) { case MC_LOCATION_TYPE_ADDRESS: - new_var->address = location.memory_location; + new_var.address = location.memory_location; break; case MC_LOCATION_TYPE_REGISTER: default: @@ -371,7 +330,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, xbt_die("No address"); } - xbt_dynar_push(result, &new_var); + result.push_back(std::move(new_var)); } // Recursive processing of nested scopes: @@ -381,28 +340,23 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, } } -static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index) +static std::vector MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index) { unsigned cursor1 = 0; mc_stack_frame_t stack_frame; - xbt_dynar_t variables = - xbt_dynar_new(sizeof(local_variable_t), local_variable_free_voidp); + std::vector variables; xbt_dynar_foreach(stack_frames, cursor1, stack_frame) { mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables); } - - return variables; + return std::move(variables); } static void MC_stack_frame_free_voipd(void *s) { mc_stack_frame_t stack_frame = *(mc_stack_frame_t *) s; - if (stack_frame) { - xbt_free(stack_frame->frame_name); - xbt_free(stack_frame); - } + delete(stack_frame); } static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) @@ -421,7 +375,7 @@ static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) } else while (1) { - mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1); + mc_stack_frame_t stack_frame = new s_mc_stack_frame_t(); xbt_dynar_push(result, &stack_frame); stack_frame->unw_cursor = c; @@ -440,12 +394,12 @@ static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context) stack_frame->frame = frame; if (frame) { - stack_frame->frame_name = xbt_strdup(frame->name); + stack_frame->frame_name = frame->name; stack_frame->frame_base = (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c); } else { stack_frame->frame_base = 0; - stack_frame->frame_name = NULL; + stack_frame->frame_name = std::string(); } /* Stop before context switch with maestro */ @@ -481,7 +435,7 @@ static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot) // FIXME, cross-process support (stack_areas) xbt_dynar_foreach(stacks_areas, cursor, current_stack) { - mc_snapshot_stack_t st = xbt_new(s_mc_snapshot_stack_t, 1); + mc_snapshot_stack_t st = new s_mc_snapshot_stack(); // Read the context from remote process: unw_context_t context; @@ -501,64 +455,51 @@ 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; } -static xbt_dynar_t MC_take_snapshot_ignore() +static std::vector MC_take_snapshot_ignore() { + std::vector res; if (mc_heap_comparison_ignore == NULL) - return NULL; - - xbt_dynar_t cpy = - xbt_dynar_new(sizeof(mc_heap_ignore_region_t), - heap_ignore_region_free_voidp); + return std::move(res); unsigned int cursor = 0; mc_heap_ignore_region_t current_region; xbt_dynar_foreach(mc_heap_comparison_ignore, cursor, current_region) { - mc_heap_ignore_region_t new_region = NULL; - new_region = xbt_new0(s_mc_heap_ignore_region_t, 1); - new_region->address = current_region->address; - new_region->size = current_region->size; - new_region->block = current_region->block; - new_region->fragment = current_region->fragment; - xbt_dynar_push(cpy, &new_region); + s_mc_heap_ignore_region_t new_region; + new_region.address = current_region->address; + new_region.size = current_region->size; + new_region.block = current_region->block; + new_region.fragment = current_region->fragment; + res.push_back(std::move(new_region)); } - return cpy; - -} - -static void mc_free_snapshot_ignored_data_pvoid(void* data) { - mc_snapshot_ignored_data_t ignored_data = (mc_snapshot_ignored_data_t) data; - free(ignored_data->data); + return std::move(res); } static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot) { xbt_assert(snapshot->process); - snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid); - + // Copy the memory: for (auto const& region : mc_model_checker->process().ignored_regions()) { s_mc_snapshot_ignored_data_t ignored_data; ignored_data.start = (void*)region.addr; - ignored_data.size = region.size; - ignored_data.data = malloc(region.size); + ignored_data.data.resize(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.data(), region.size, remote(region.addr), simgrid::mc::ProcessIndexDisabled); - xbt_dynar_push(snapshot->ignored_data, &ignored_data); + snapshot->ignored_data.push_back(std::move(ignored_data)); } // Zero the memory: @@ -570,22 +511,18 @@ static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot) static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot) { - unsigned int cursor = 0; - s_mc_snapshot_ignored_data_t ignored_data; - xbt_dynar_foreach (snapshot->ignored_data, cursor, ignored_data) { - snapshot->process->write_bytes(ignored_data.data, ignored_data.size, + for (auto const& ignored_data : snapshot->ignored_data) + snapshot->process->write_bytes( + ignored_data.data.data(), ignored_data.data.size(), remote(ignored_data.start)); - } } -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"); @@ -594,7 +531,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))) { @@ -606,7 +544,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); @@ -644,18 +582,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) @@ -669,16 +605,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); @@ -704,11 +638,10 @@ mc_snapshot_t MC_take_snapshot(int num_state) static inline void MC_restore_snapshot_regions(mc_snapshot_t snapshot) { - const size_t n = snapshot->snapshot_regions_count; - for (size_t i = 0; i < n; i++) { + for(std::unique_ptr const& region : snapshot->snapshot_regions) { // For privatized, variables we decided it was not necessary to take the snapshot: - if (snapshot->snapshot_regions[i]) - MC_region_restore(snapshot->snapshot_regions[i]); + if (region) + MC_region_restore(region.get()); } #ifdef HAVE_SMPI @@ -731,20 +664,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); } }