X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c7df79fb2ff6e105b83092e142fbe74214fd3b75..d5b29830df70e823202e384a7655e4371193ecd7:/src/mc/mc_checkpoint.cpp?ds=sidebyside diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index 7e1084b34d..e4fa6e445a 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -11,12 +11,15 @@ #include #include +#ifndef WIN32 +#include +#endif + #include "src/internal_config.h" #include "src/mc/mc_private.h" -#include "xbt/module.h" -#include -#include #include "src/smpi/private.h" +#include "xbt/mmalloc.h" +#include "xbt/module.h" #include "src/xbt/mmalloc/mmprivate.h" @@ -28,12 +31,12 @@ #include "src/mc/mc_private.h" #include -#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_hash.hpp" #include "src/mc/mc_mmu.h" -#include "src/mc/mc_unw.h" -#include "src/mc/mc_protocol.h" #include "src/mc/mc_smx.h" -#include "mc_hash.hpp" +#include "src/mc/mc_snapshot.h" +#include "src/mc/mc_unw.h" +#include "src/mc/remote/mc_protocol.h" #include "src/mc/RegionSnapshot.hpp" #include "src/mc/ObjectInformation.hpp" @@ -42,8 +45,7 @@ using simgrid::mc::remote; -XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, - "Logging specific to mc_checkpoint"); +XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); namespace simgrid { namespace mc { @@ -53,7 +55,7 @@ namespace mc { /** @brief Restore a region from a snapshot * - * @param reg Target region + * @param region Target region */ static void restore(mc_mem_region_t region) { @@ -82,7 +84,7 @@ static void restore(mc_mem_region_t region) #if HAVE_SMPI RegionSnapshot privatized_region( RegionType region_type, void *start_addr, void* permanent_addr, - std::size_t size, const RegionSnapshot* ref_region + std::size_t size ) { size_t process_count = MC_smpi_process_count(); @@ -99,18 +101,14 @@ RegionSnapshot privatized_region( std::vector data; data.reserve(process_count); - for (size_t i = 0; i < process_count; i++) { - const simgrid::mc::RegionSnapshot* ref_privatized_region = nullptr; - if (ref_region && ref_region->storage_type() == StorageType::Privatized) - ref_privatized_region = &ref_region->privatized_data()[i]; + for (size_t i = 0; i < process_count; i++) data.push_back(simgrid::mc::region(region_type, start_addr, - privatisation_regions[i].address, size, ref_privatized_region)); - } + 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; } #endif @@ -124,11 +122,7 @@ void add_region(int index, simgrid::mc::Snapshot* snapshot, if (type == simgrid::mc::RegionType::Data) xbt_assert(object_info, "Missing object info for object."); else if (type == simgrid::mc::RegionType::Heap) - xbt_assert(!object_info, "Unexpected object info for heap region."); - - simgrid::mc::RegionSnapshot const* ref_region = nullptr; - if (mc_model_checker->parent_snapshot_) - ref_region = mc_model_checker->parent_snapshot_->snapshot_regions[index].get(); + xbt_assert(not object_info, "Unexpected object info for heap region."); simgrid::mc::RegionSnapshot region; #if HAVE_SMPI @@ -136,10 +130,10 @@ void add_region(int index, simgrid::mc::Snapshot* snapshot, && mc_model_checker->process().privatized(*object_info); if (privatization_aware && MC_smpi_process_count()) region = simgrid::mc::privatized_region( - type, start_addr, permanent_addr, size, ref_region); + type, start_addr, permanent_addr, size); else #endif - region = simgrid::mc::region(type, start_addr, permanent_addr, size, ref_region); + region = simgrid::mc::region(type, start_addr, permanent_addr, size); region.object_info(object_info); snapshot->snapshot_regions[index] @@ -207,9 +201,7 @@ void find_object_address( // This is the non-GNU_RELRO-part of the data segment: if (reg.prot == PROT_RW) { - xbt_assert(!result->start_rw, - "Multiple read-write segments for %s, not supported", - maps[i].pathname.c_str()); + xbt_assert(not result->start_rw, "Multiple read-write segments for %s, not supported", maps[i].pathname.c_str()); result->start_rw = (char*) reg.start_addr; result->end_rw = (char*) reg.end_addr; @@ -223,8 +215,7 @@ void find_object_address( // This is the text segment: else if (reg.prot == PROT_RX) { - xbt_assert(!result->start_exec, - "Multiple executable segments for %s, not supported", + xbt_assert(not result->start_exec, "Multiple executable segments for %s, not supported", maps[i].pathname.c_str()); result->start_exec = (char*) reg.start_addr; result->end_exec = (char*) reg.end_addr; @@ -241,22 +232,20 @@ void find_object_address( // This is the GNU_RELRO-part of the data segment: else if (reg.prot == PROT_READ) { - xbt_assert(!result->start_ro, - "Multiple read only segments for %s, not supported", - maps[i].pathname.c_str()); + xbt_assert(not result->start_ro, "Multiple read only segments for %s, not supported", maps[i].pathname.c_str()); result->start_ro = (char*) reg.start_addr; result->end_ro = (char*) reg.end_addr; } } result->start = result->start_rw; - if ((const void*) result->start_ro > result->start) + if ((const void*) result->start_ro < result->start) result->start = result->start_ro; - if ((const void*) result->start_exec > result->start) + if ((const void*) result->start_exec < result->start) result->start = result->start_exec; result->end = result->end_rw; - if (result->end_ro && (const void*) result->end_ro < result->end) + if (result->end_ro && (const void*) result->end_ro > result->end) result->end = result->end_ro; if (result->end_exec && (const void*) result->end_exec > result->end) result->end = result->end_exec; @@ -274,7 +263,7 @@ void find_object_address( * A variable may be defined only from a given value of IP. * * \param var Variable description - * \param frame Scope description + * \param scope Scope description * \param ip Instruction pointer * \return true if the variable is valid * */ @@ -296,13 +285,13 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, { simgrid::mc::Process* process = &mc_model_checker->process(); - if (!scope->range.contain(stack_frame->ip)) + if (not scope || not scope->range.contain(stack_frame->ip)) return; for(simgrid::mc::Variable& current_variable : scope->variables) { - if (!valid_variable(¤t_variable, scope, (void *) stack_frame->ip)) + if (not valid_variable(¤t_variable, scope, (void*)stack_frame->ip)) continue; int region_type; @@ -322,7 +311,7 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, if (current_variable.address != nullptr) new_var.address = current_variable.address; - else if (!current_variable.location_list.empty()) { + else if (not current_variable.location_list.empty()) { simgrid::dwarf::Location location = simgrid::dwarf::resolve( current_variable.location_list, @@ -331,7 +320,7 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, (void *) stack_frame->frame_base, &mc_model_checker->process(), process_index); - if (!location.in_memory()) + if (not location.in_memory()) xbt_die("Cannot handle non-address variable"); new_var.address = location.address(); @@ -353,7 +342,7 @@ static std::vector get_local_variables_values( std::vector variables; for (s_mc_stack_frame_t& stack_frame : stack_frames) fill_local_variables_values(&stack_frame, stack_frame.frame, process_index, variables); - return std::move(variables); + return variables; } static std::vector unwind_stack_frames(simgrid::mc::UnwindContext* stack_context) @@ -371,7 +360,8 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo stack_frame.unw_cursor = c; - unw_word_t ip, sp; + unw_word_t ip; + unw_word_t sp; unw_get_reg(&c, UNW_REG_IP, &ip); unw_get_reg(&c, UNW_REG_SP, &sp); @@ -412,8 +402,8 @@ static std::vector unwind_stack_frames(simgrid::mc::UnwindCo xbt_abort(); } - return std::move(result); -}; + return result; +} static std::vector take_snapshot_stacks(simgrid::mc::Snapshot* snapshot) { @@ -442,14 +432,14 @@ static std::vector take_snapshot_stacks(simgrid::mc::Snap snapshot->stack_sizes.push_back(stack_size); } - return std::move(res); + return res; } static void snapshot_handle_ignore(simgrid::mc::Snapshot* snapshot) { xbt_assert(snapshot->process()); - + // Copy the memory: for (auto const& region : mc_model_checker->process().ignored_regions()) { s_mc_snapshot_ignored_data_t ignored_data; @@ -531,7 +521,7 @@ static std::vector get_current_fds(pid_t pid) // We don't handle them. // It does not mean we should silently ignore them however. - if (strncmp(link, "pipe:", 5) == 0 || strncmp(link, "socket:", 7) == 0) + if (strncmp(link, "pipe:", std::strlen("pipe:")) == 0 || strncmp(link, "socket:", std::strlen("socket:")) == 0) continue; // If dot_output enabled, do not handle the corresponding file @@ -545,7 +535,7 @@ static std::vector get_current_fds(pid_t pid) } // This is probably a shared memory used by lttng-ust: - if(strncmp("/dev/shm/ust-shm-tmp-", link, 21)==0) + if(strncmp("/dev/shm/ust-shm-tmp-", link, std::strlen("/dev/shm/ust-shm-tmp-"))==0) continue; // Add an entry for this FD in the snapshot: @@ -558,7 +548,7 @@ static std::vector get_current_fds(pid_t pid) } closedir (fd_dir); - return std::move(fds); + return fds; } std::shared_ptr take_snapshot(int num_state) @@ -567,29 +557,22 @@ std::shared_ptr take_snapshot(int num_state) simgrid::mc::Process* mc_process = &mc_model_checker->process(); - std::shared_ptr snapshot = - std::make_shared(mc_process); + std::shared_ptr snapshot = std::make_shared(mc_process, num_state); - snapshot->num_state = num_state; - - for (auto& p : mc_model_checker->process().simix_processes()) - snapshot->enabled_processes.insert(p.copy.pid); + for (auto& p : mc_model_checker->process().actors()) + snapshot->enabled_processes.insert(p.copy.getBuffer()->pid); snapshot_handle_ignore(snapshot.get()); if (_sg_mc_snapshot_fds) 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 */ get_memory_regions(mc_process, snapshot.get()); - if (use_soft_dirty) - mc_process->reset_soft_dirty(); snapshot->to_ignore = mc_model_checker->process().ignored_heap(); - if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) { + if (_sg_mc_max_visited_states > 0 || strcmp(_sg_mc_property_file, "")) { snapshot->stacks = take_snapshot_stacks(snapshot.get()); if (_sg_mc_hash) snapshot->hash = simgrid::mc::hash(*snapshot); @@ -599,8 +582,6 @@ std::shared_ptr take_snapshot(int num_state) snapshot->hash = 0; snapshot_ignore_restore(snapshot.get()); - if (use_soft_dirty) - mc_model_checker->parent_snapshot_ = snapshot; return snapshot; } @@ -628,19 +609,17 @@ void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot) static inline void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot) { - if (mc_mode == MC_MODE_SERVER) - xbt_die("FD snapshot not implemented in client/server mode."); + xbt_die("FD snapshot not implemented in client/server mode."); for (auto const& fd : snapshot->current_fds) { - + 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", - fd.filename.c_str()); + 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); - }; + } lseek(fd.number, fd.current_position, SEEK_SET); } } @@ -648,16 +627,11 @@ void restore_snapshot_fds(simgrid::mc::Snapshot* snapshot) void restore_snapshot(std::shared_ptr snapshot) { XBT_DEBUG("Restore snapshot %i", snapshot->num_state); - const bool use_soft_dirty = _sg_mc_sparse_checkpoint && _sg_mc_soft_dirty; restore_snapshot_regions(snapshot.get()); if (_sg_mc_snapshot_fds) restore_snapshot_fds(snapshot.get()); - if (use_soft_dirty) - mc_model_checker->process().reset_soft_dirty(); snapshot_ignore_restore(snapshot.get()); mc_model_checker->process().clear_cache(); - if (use_soft_dirty) - mc_model_checker->parent_snapshot_ = snapshot; } }