X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/befbbbe1fbb31663a8f91e24ce12df271cf4ae79..3e5588fc9b34239f448a523211086b05c9fee29c:/src/mc/mc_checkpoint.cpp diff --git a/src/mc/mc_checkpoint.cpp b/src/mc/mc_checkpoint.cpp index e4fa6e445a..aa9f21d46f 100644 --- a/src/mc/mc_checkpoint.cpp +++ b/src/mc/mc_checkpoint.cpp @@ -1,4 +1,4 @@ -/* Copyright (c) 2008-2015. The SimGrid Team. +/* Copyright (c) 2008-2017. The SimGrid Team. * All rights reserved. */ /* This program is free software; you can redistribute it and/or modify it @@ -6,36 +6,37 @@ #include +#include +#include #include -#include #include -#include #ifndef WIN32 #include #endif #include "src/internal_config.h" -#include "src/mc/mc_private.h" -#include "src/smpi/private.h" +#include "src/mc/mc_private.hpp" +#include "src/smpi/include/private.hpp" +#include "xbt/file.hpp" #include "xbt/mmalloc.h" #include "xbt/module.h" #include "src/xbt/mmalloc/mmprivate.h" -#include "src/simix/smx_private.h" +#include "src/simix/smx_private.hpp" #include #include -#include "src/mc/mc_private.h" +#include "src/mc/mc_private.hpp" #include #include "src/mc/mc_hash.hpp" -#include "src/mc/mc_mmu.h" -#include "src/mc/mc_smx.h" -#include "src/mc/mc_snapshot.h" -#include "src/mc/mc_unw.h" +#include "src/mc/mc_mmu.hpp" +#include "src/mc/mc_smx.hpp" +#include "src/mc/mc_snapshot.hpp" +#include "src/mc/mc_unw.hpp" #include "src/mc/remote/mc_protocol.h" #include "src/mc/RegionSnapshot.hpp" @@ -47,6 +48,10 @@ using simgrid::mc::remote; XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc, "Logging specific to mc_checkpoint"); +#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC) +#define PROT_RW (PROT_READ | PROT_WRITE) +#define PROT_RX (PROT_READ | PROT_EXEC) + namespace simgrid { namespace mc { @@ -60,11 +65,6 @@ namespace mc { static void restore(mc_mem_region_t region) { switch(region->storage_type()) { - case simgrid::mc::StorageType::NoData: - default: - xbt_die("Storage type not supported"); - break; - case simgrid::mc::StorageType::Flat: mc_model_checker->process().write_bytes(region->flat_data().get(), region->size(), region->permanent_address()); @@ -78,6 +78,10 @@ static void restore(mc_mem_region_t region) for (auto& p : region->privatized_data()) restore(&p); break; + + default: // includes StorageType::NoData + xbt_die("Storage type not supported"); + break; } } @@ -89,21 +93,21 @@ RegionSnapshot privatized_region( { size_t process_count = MC_smpi_process_count(); - // Read smpi_privatisation_regions from MCed: - smpi_privatisation_region_t remote_smpi_privatisation_regions; + // Read smpi_privatization_regions from MCed: + smpi_privatization_region_t remote_smpi_privatization_regions; mc_model_checker->process().read_variable( - "smpi_privatisation_regions", - &remote_smpi_privatisation_regions, sizeof(remote_smpi_privatisation_regions)); - s_smpi_privatisation_region_t privatisation_regions[process_count]; + "smpi_privatization_regions", + &remote_smpi_privatization_regions, sizeof(remote_smpi_privatization_regions)); + s_smpi_privatization_region_t privatization_regions[process_count]; mc_model_checker->process().read_bytes( - &privatisation_regions, sizeof(privatisation_regions), - remote(remote_smpi_privatisation_regions)); + &privatization_regions, sizeof(privatization_regions), + remote(remote_smpi_privatization_regions)); 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)); + privatization_regions[i].address, size)); simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot( region_type, start_addr, permanent_addr, size); @@ -142,7 +146,7 @@ void add_region(int index, simgrid::mc::Snapshot* snapshot, return; } -static void get_memory_regions(simgrid::mc::Process* process, simgrid::mc::Snapshot* snapshot) +static void get_memory_regions(simgrid::mc::RemoteClient* process, simgrid::mc::Snapshot* snapshot) { const size_t n = process->object_infos.size(); snapshot->snapshot_regions.resize(n + 1); @@ -175,10 +179,6 @@ static void get_memory_regions(simgrid::mc::Process* process, simgrid::mc::Snaps snapshot->privatization_index = simgrid::mc::ProcessIndexMissing; } -#define PROT_RWX (PROT_READ | PROT_WRITE | PROT_EXEC) -#define PROT_RW (PROT_READ | PROT_WRITE) -#define PROT_RX (PROT_READ | PROT_EXEC) - /** \brief Fills the position of the segments (executable, read-only, read/write). * */ // TODO, use the ELF segment information for more robustness @@ -186,18 +186,15 @@ void find_object_address( std::vector const& maps, simgrid::mc::ObjectInformation* result) { - char* name = xbt_basename(result->file_name.c_str()); + std::string name = simgrid::xbt::Path(result->file_name).getBasename(); for (size_t i = 0; i < maps.size(); ++i) { simgrid::xbt::VmMap const& reg = maps[i]; 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); + std::string map_basename = simgrid::xbt::Path(maps[i].pathname).getBasename(); + if (map_basename != name) continue; - } - free(map_basename); // This is the non-GNU_RELRO-part of the data segment: if (reg.prot == PROT_RW) { @@ -251,8 +248,6 @@ void find_object_address( result->end = result->end_exec; xbt_assert(result->start_exec || result->start_rw || result->start_ro); - - free(name); } /************************************* Take Snapshot ************************************/ @@ -278,18 +273,15 @@ static bool valid_variable(simgrid::mc::Variable* var, return true; } -static void fill_local_variables_values(mc_stack_frame_t stack_frame, - simgrid::mc::Frame* scope, - int process_index, - std::vector& result) +static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::mc::Frame* scope, int process_index, + std::vector& result) { - simgrid::mc::Process* process = &mc_model_checker->process(); + simgrid::mc::RemoteClient* process = &mc_model_checker->process(); if (not scope || not scope->range.contain(stack_frame->ip)) return; - for(simgrid::mc::Variable& current_variable : - scope->variables) { + for (simgrid::mc::Variable& current_variable : scope->variables) { if (not valid_variable(¤t_variable, scope, (void*)stack_frame->ip)) continue; @@ -331,15 +323,15 @@ static void fill_local_variables_values(mc_stack_frame_t stack_frame, } // Recursive processing of nested scopes: - for(simgrid::mc::Frame& nested_scope : scope->scopes) + for (simgrid::mc::Frame& nested_scope : scope->scopes) fill_local_variables_values( stack_frame, &nested_scope, process_index, result); } -static std::vector get_local_variables_values( - std::vector& stack_frames, int process_index) +static std::vector get_local_variables_values(std::vector& stack_frames, + int process_index) { - std::vector variables; + 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 variables; @@ -347,7 +339,7 @@ static std::vector get_local_variables_values( static std::vector unwind_stack_frames(simgrid::mc::UnwindContext* stack_context) { - simgrid::mc::Process* process = &mc_model_checker->process(); + simgrid::mc::RemoteClient* process = &mc_model_checker->process(); std::vector result; unw_cursor_t c = stack_context->cursor(); @@ -453,7 +445,7 @@ static void snapshot_handle_ignore(simgrid::mc::Snapshot* 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); } @@ -510,7 +502,7 @@ static std::vector get_current_fds(pid_t pid) link[res] = '\0'; #if HAVE_SMPI - if(smpi_is_privatisation_file(link)) + if(smpi_is_privatization_file(link)) continue; #endif @@ -526,12 +518,9 @@ static std::vector get_current_fds(pid_t pid) // If dot_output enabled, do not handle the corresponding file if (dot_output != nullptr) { - char* link_basename = xbt_basename(link); - if (strcmp(link_basename, _sg_mc_dot_output_file) == 0) { - free(link_basename); + std::string link_basename = simgrid::xbt::Path(link).getBasename(); + if (link_basename == _sg_mc_dot_output_file) continue; - } - free(link_basename); } // This is probably a shared memory used by lttng-ust: @@ -555,11 +544,11 @@ std::shared_ptr take_snapshot(int num_state) { XBT_DEBUG("Taking snapshot %i", num_state); - simgrid::mc::Process* mc_process = &mc_model_checker->process(); + simgrid::mc::RemoteClient* mc_process = &mc_model_checker->process(); std::shared_ptr snapshot = std::make_shared(mc_process, num_state); - for (auto& p : mc_model_checker->process().actors()) + for (auto const& p : mc_model_checker->process().actors()) snapshot->enabled_processes.insert(p.copy.getBuffer()->pid); snapshot_handle_ignore(snapshot.get()); @@ -588,19 +577,16 @@ std::shared_ptr take_snapshot(int num_state) static inline void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot) { - for(std::unique_ptr const& region : snapshot->snapshot_regions) { + for (std::unique_ptr const& region : snapshot->snapshot_regions) { // For privatized, variables we decided it was not necessary to take the snapshot: if (region) restore(region.get()); } #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; + s_mc_message_restore message{MC_MESSAGE_RESTORE, snapshot->privatization_index}; mc_model_checker->process().getChannel().send(message); } #endif