X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/347996b4a10c4e8579080692afa60e0afb88b60a..864d17d38d2f5ffecea2c9104af9e538a25b56db:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 0bfaf47f85..77d6a73854 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -6,6 +6,7 @@ #include +#include #include #include #include @@ -14,8 +15,8 @@ #include "src/mc/mc_private.h" #include "xbt/module.h" #include +#include #include "src/smpi/private.h" -#include #include "src/xbt/mmalloc/mmprivate.h" @@ -28,7 +29,6 @@ #include #include "src/mc/mc_snapshot.h" -#include "src/mc/mc_object_info.h" #include "src/mc/mc_mmu.h" #include "src/mc/mc_unw.h" #include "src/mc/mc_protocol.h" @@ -42,11 +42,12 @@ using simgrid::mc::remote; -extern "C" { - XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); +namespace simgrid { +namespace mc { + /************************************ Free functions **************************************/ /*****************************************************************************************/ @@ -54,7 +55,7 @@ XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, * * @param reg Target region */ -static void MC_region_restore(mc_mem_region_t region) +static void restore(mc_mem_region_t region) { switch(region->storage_type()) { case simgrid::mc::StorageType::NoData: @@ -63,7 +64,7 @@ static void MC_region_restore(mc_mem_region_t region) break; case simgrid::mc::StorageType::Flat: - mc_model_checker->process().write_bytes(region->flat_data(), + mc_model_checker->process().write_bytes(region->flat_data().get(), region->size(), region->permanent_address()); break; @@ -73,17 +74,12 @@ static void MC_region_restore(mc_mem_region_t region) case simgrid::mc::StorageType::Privatized: for (auto& p : region->privatized_data()) - MC_region_restore(&p); + restore(&p); break; } } -} - -namespace simgrid { -namespace mc { - -#ifdef HAVE_SMPI +#if HAVE_SMPI RegionSnapshot privatized_region( RegionType region_type, void *start_addr, void* permanent_addr, std::size_t size, const RegionSnapshot* ref_region @@ -118,12 +114,8 @@ RegionSnapshot privatized_region( } #endif -} -} - -extern "C" { - -static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, +static +void add_region(int index, mc_snapshot_t snapshot, simgrid::mc::RegionType type, simgrid::mc::ObjectInformation* object_info, void *start_addr, void* permanent_addr, @@ -139,7 +131,7 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, ref_region = mc_model_checker->parent_snapshot_->snapshot_regions[index].get(); simgrid::mc::RegionSnapshot region; -#ifdef HAVE_SMPI +#if HAVE_SMPI const bool privatization_aware = object_info && mc_model_checker->process().privatized(*object_info); if (privatization_aware && MC_smpi_process_count()) @@ -156,59 +148,60 @@ static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot, return; } -static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot) +static void get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot) { const size_t n = process->object_infos.size(); snapshot->snapshot_regions.resize(n + 1); int i = 0; - for (auto const& object_info : process->object_infos) { - MC_snapshot_add_region(i, snapshot, simgrid::mc::RegionType::Data, + for (auto const& object_info : process->object_infos) + add_region(i++, snapshot, simgrid::mc::RegionType::Data, object_info.get(), object_info->start_rw, object_info->start_rw, object_info->end_rw - object_info->start_rw); - ++i; - } xbt_mheap_t heap = process->get_heap(); void *start_heap = heap->base; void *end_heap = heap->breakval; - MC_snapshot_add_region(n, snapshot, simgrid::mc::RegionType::Heap, NULL, + add_region(n, snapshot, simgrid::mc::RegionType::Heap, nullptr, start_heap, start_heap, (char *) end_heap - (char *) start_heap); snapshot->heap_bytes_used = mmalloc_get_bytes_used_remote( heap->heaplimit, process->get_malloc_info()); -#ifdef HAVE_SMPI - if (mc_model_checker->process().privatized() && MC_smpi_process_count()) { +#if HAVE_SMPI + if (mc_model_checker->process().privatized() && MC_smpi_process_count()) // snapshot->privatization_index = smpi_loaded_page mc_model_checker->process().read_variable( "smpi_loaded_page", &snapshot->privatization_index, sizeof(snapshot->privatization_index)); - } else + else #endif - { snapshot->privatization_index = simgrid::mc::ProcessIndexMissing; - } } /** \brief Fills the position of the segments (executable, read-only, read/write). * * `dl_iterate_phdr` would be more robust but would not work in cross-process. * */ -void MC_find_object_address( +void find_object_address( std::vector const& maps, simgrid::mc::ObjectInformation* result) { - char* file_name = xbt_strdup(result->file_name.c_str()); - const char *name = basename(file_name); + char* name = xbt_basename(result->file_name.c_str()); + for (size_t i = 0; i < maps.size(); ++i) { simgrid::xbt::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)) { + if (maps[i].pathname.empty()) + continue; + char* map_basename = xbt_basename(maps[i].pathname.c_str()); + if (strcmp(name, map_basename) != 0) { + free(map_basename); + continue; + } + free(map_basename); + if ((reg.prot & PROT_WRITE)) { xbt_assert(!result->start_rw, "Multiple read-write segments for %s, not supported", maps[i].pathname.c_str()); @@ -217,9 +210,8 @@ void MC_find_object_address( // .bss is usually after the .data: simgrid::xbt::VmMap const& next = maps[i + 1]; if (next.pathname.empty() && (next.prot & PROT_WRITE) - && next.start_addr == reg.end_addr) { + && 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", @@ -249,7 +241,8 @@ void MC_find_object_address( xbt_assert(result->start_rw); xbt_assert(result->start_exec); - free(file_name); + + free(name); } /************************************* Take Snapshot ************************************/ @@ -264,7 +257,7 @@ void MC_find_object_address( * \param ip Instruction pointer * \return true if the variable is valid * */ -static bool mc_valid_variable(simgrid::mc::Variable* var, +static bool valid_variable(simgrid::mc::Variable* var, simgrid::mc::Frame* scope, const void *ip) { @@ -275,7 +268,7 @@ static bool mc_valid_variable(simgrid::mc::Variable* var, return true; } -static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, +static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::mc::Frame* scope, int process_index, std::vector& result) @@ -288,7 +281,7 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, for(simgrid::mc::Variable& current_variable : scope->variables) { - if (!mc_valid_variable(¤t_variable, scope, (void *) stack_frame->ip)) + if (!valid_variable(¤t_variable, scope, (void *) stack_frame->ip)) continue; int region_type; @@ -306,9 +299,9 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, new_var.region = region_type; new_var.address = nullptr; - if (current_variable.address != NULL) { + if (current_variable.address != nullptr) new_var.address = current_variable.address; - } else if (!current_variable.location_list.empty()) { + else if (!current_variable.location_list.empty()) { simgrid::dwarf::Location location = simgrid::dwarf::resolve( current_variable.location_list, @@ -321,35 +314,28 @@ static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame, xbt_die("Cannot handle non-address variable"); new_var.address = location.address(); - } else { + } else xbt_die("No address"); - } result.push_back(std::move(new_var)); } // Recursive processing of nested scopes: for(simgrid::mc::Frame& nested_scope : scope->scopes) - mc_fill_local_variables_values( + fill_local_variables_values( stack_frame, &nested_scope, process_index, result); } -static std::vector MC_get_local_variables_values( +static std::vector get_local_variables_values( std::vector& stack_frames, int process_index) { std::vector variables; for (s_mc_stack_frame_t& stack_frame : stack_frames) - mc_fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables); + fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, 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; - delete(stack_frame); -} - -static std::vector MC_unwind_stack_frames(mc_unw_context_t stack_context) +static std::vector unwind_stack_frames(mc_unw_context_t stack_context) { simgrid::mc::Process* process = &mc_model_checker->process(); std::vector result; @@ -357,11 +343,9 @@ static std::vector MC_unwind_stack_frames(mc_unw_context_t s unw_cursor_t c; // TODO, check condition check (unw_init_local==0 means end of frame) - if (mc_unw_init_cursor(&c, stack_context) != 0) { - + if (mc_unw_init_cursor(&c, stack_context) != 0) xbt_die("Could not initialize stack unwinding"); - } else while (1) { s_mc_stack_frame_t stack_frame; @@ -398,11 +382,10 @@ static std::vector MC_unwind_stack_frames(mc_unw_context_t s break; int ret = unw_step(&c); - if (ret == 0) { + if (ret == 0) xbt_die("Unexpected end of stack."); - } else if (ret < 0) { + else if (ret < 0) xbt_die("Error while unwinding stack"); - } } if (result.empty()) { @@ -413,7 +396,7 @@ static std::vector MC_unwind_stack_frames(mc_unw_context_t s return std::move(result); }; -static std::vector MC_take_snapshot_stacks(mc_snapshot_t * snapshot) +static std::vector take_snapshot_stacks(mc_snapshot_t * snapshot) { std::vector res; @@ -426,11 +409,11 @@ static std::vector MC_take_snapshot_stacks(mc_snapshot_t &context, sizeof(context), remote(stack.context)); if (mc_unw_init_context(&st.context, &mc_model_checker->process(), - &context) < 0) { + &context) < 0) xbt_die("Could not initialise the libunwind context."); - } - st.stack_frames = MC_unwind_stack_frames(&st.context); - st.local_variables = MC_get_local_variables_values(st.stack_frames, stack.process_index); + + st.stack_frames = unwind_stack_frames(&st.context); + st.local_variables = get_local_variables_values(st.stack_frames, stack.process_index); st.process_index = stack.process_index; unw_word_t sp = st.stack_frames[0].sp; @@ -446,7 +429,7 @@ static std::vector MC_take_snapshot_stacks(mc_snapshot_t } -static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot) +static void snapshot_handle_ignore(mc_snapshot_t snapshot) { xbt_assert(snapshot->process()); @@ -463,13 +446,12 @@ static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot) } // Zero the memory: - for(auto const& region : mc_model_checker->process().ignored_regions()) { + for(auto const& region : mc_model_checker->process().ignored_regions()) snapshot->process()->clear_bytes(remote(region.addr), region.size); - } } -static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot) +static void snapshot_ignore_restore(mc_snapshot_t snapshot) { for (auto const& ignored_data : snapshot->ignored_data) snapshot->process()->write_bytes( @@ -477,7 +459,7 @@ static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot) remote(ignored_data.start)); } -static std::vector MC_get_current_fds(pid_t pid) +static std::vector get_current_fds(pid_t pid) { const size_t fd_dir_path_size = 20; char fd_dir_path[fd_dir_path_size]; @@ -488,7 +470,7 @@ static std::vector MC_get_current_fds(pid_t pid) xbt_die("Unexpected buffer is too small for fd_dir_path"); DIR* fd_dir = opendir(fd_dir_path); - if (fd_dir == NULL) + if (fd_dir == nullptr) xbt_die("Cannot open directory '/proc/self/fd'\n"); std::vector fds; @@ -512,15 +494,15 @@ static std::vector MC_get_current_fds(pid_t pid) const size_t link_size = 200; char link[200]; res = readlink(source, link, link_size); - if (res<0) { + + if (res<0) xbt_die("Could not read link for %s", source); - } - if (res==200) { + if (res==200) xbt_die("Buffer to small for link of %s", source); - } + link[res] = '\0'; -#ifdef HAVE_SMPI +#if HAVE_SMPI if(smpi_is_privatisation_file(link)) continue; #endif @@ -536,8 +518,14 @@ static std::vector MC_get_current_fds(pid_t pid) continue; // If dot_output enabled, do not handle the corresponding file - if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0) - continue; + if (dot_output != nullptr) { + char* link_basename = xbt_basename(link); + if (strcmp(link_basename, _sg_mc_dot_output_file) == 0) { + free(link_basename); + continue; + } + free(link_basename); + } // This is probably a shared memory used by lttng-ust: if(strncmp("/dev/shm/ust-shm-tmp-", link, 21)==0) @@ -556,7 +544,7 @@ static std::vector MC_get_current_fds(pid_t pid) return std::move(fds); } -mc_snapshot_t MC_take_snapshot(int num_state) +mc_snapshot_t take_snapshot(int num_state) { XBT_DEBUG("Taking snapshot %i", num_state); @@ -566,19 +554,18 @@ mc_snapshot_t MC_take_snapshot(int num_state) snapshot->num_state = num_state; - smx_process_t process; - MC_EACH_SIMIX_PROCESS(process, - snapshot->enabled_processes.insert(process->pid)); + for (auto& p : mc_model_checker->process().simix_processes()) + snapshot->enabled_processes.insert(p.copy.pid); - MC_snapshot_handle_ignore(snapshot); + snapshot_handle_ignore(snapshot); if (_sg_mc_snapshot_fds) - snapshot->current_fds = MC_get_current_fds(process->pid); + snapshot->current_fds = get_current_fds(mc_model_checker->process().pid()); const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty; /* Save the std heap and the writable mapped pages of libsimgrid and binary */ - MC_get_memory_regions(mc_process, snapshot); + get_memory_regions(mc_process, snapshot); if (use_soft_dirty) mc_process->reset_soft_dirty(); @@ -586,45 +573,43 @@ mc_snapshot_t MC_take_snapshot(int num_state) if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) { snapshot->stacks = - MC_take_snapshot_stacks(&snapshot); - if (_sg_mc_hash) { + take_snapshot_stacks(&snapshot); + if (_sg_mc_hash) snapshot->hash = simgrid::mc::hash(*snapshot); - } else { + else snapshot->hash = 0; - } - } else { + } else snapshot->hash = 0; - } - MC_snapshot_ignore_restore(snapshot); + snapshot_ignore_restore(snapshot); if (use_soft_dirty) mc_model_checker->parent_snapshot_ = snapshot; return snapshot; } static inline -void MC_restore_snapshot_regions(mc_snapshot_t snapshot) +void restore_snapshot_regions(mc_snapshot_t snapshot) { for(std::unique_ptr const& region : snapshot->snapshot_regions) { // For privatized, variables we decided it was not necessary to take the snapshot: if (region) - MC_region_restore(region.get()); + restore(region.get()); } -#ifdef HAVE_SMPI +#if HAVE_SMPI // TODO, send a message to implement this in the MCed process if(snapshot->privatization_index >= 0) { // Fix the privatization mmap: s_mc_restore_message message; message.type = MC_MESSAGE_RESTORE; message.index = snapshot->privatization_index; - mc_model_checker->process().send_message(message); + mc_model_checker->process().getChannel().send(message); } #endif } static inline -void MC_restore_snapshot_fds(mc_snapshot_t snapshot) +void restore_snapshot_fds(mc_snapshot_t snapshot) { if (mc_mode == MC_MODE_SERVER) xbt_die("FD snapshot not implemented in client/server mode."); @@ -632,10 +617,9 @@ void MC_restore_snapshot_fds(mc_snapshot_t snapshot) for (auto const& fd : snapshot->current_fds) { int new_fd = open(fd.filename.c_str(), fd.flags); - if (new_fd < 0) { + if (new_fd < 0) xbt_die("Could not reopen the file %s fo restoring the file descriptor", fd.filename.c_str()); - } if (new_fd != fd.number) { dup2(new_fd, fd.number); close(new_fd); @@ -644,24 +628,20 @@ void MC_restore_snapshot_fds(mc_snapshot_t snapshot) } } -void MC_restore_snapshot(mc_snapshot_t snapshot) +void restore_snapshot(mc_snapshot_t snapshot) { XBT_DEBUG("Restore snapshot %i", snapshot->num_state); const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty; - MC_restore_snapshot_regions(snapshot); + restore_snapshot_regions(snapshot); if (_sg_mc_snapshot_fds) - MC_restore_snapshot_fds(snapshot); + restore_snapshot_fds(snapshot); if (use_soft_dirty) mc_model_checker->process().reset_soft_dirty(); - MC_snapshot_ignore_restore(snapshot); - mc_model_checker->process().cache_flags = 0; + snapshot_ignore_restore(snapshot); + mc_model_checker->process().clear_cache(); if (use_soft_dirty) mc_model_checker->parent_snapshot_ = snapshot; } -mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall) -{ - return MC_take_snapshot(1); } - }