-/* Copyright (c) 2008-2014. The SimGrid Team.
+/* Copyright (c) 2008-2015. The SimGrid Team.
* All rights reserved. */
/* This program is free software; you can redistribute it and/or modify it
#include <link.h>
#include <dirent.h>
-#include "internal_config.h"
-#include "mc_memory_map.h"
-#include "mc_private.h"
+#include "src/internal_config.h"
+#include "src/mc/mc_private.h"
#include "xbt/module.h"
#include <xbt/mmalloc.h>
-#include "../smpi/private.h"
+#include "src/smpi/private.h"
#include <alloca.h>
-#include "xbt/mmalloc/mmprivate.h"
+#include "src/xbt/mmalloc/mmprivate.h"
-#include "../simix/smx_private.h"
+#include "src/simix/smx_private.h"
#include <libunwind.h>
#include <libelf.h>
-#include "mc_private.h"
+#include "src/mc/mc_private.h"
#include <mc/mc.h>
-#include "mc_snapshot.h"
-#include "mc_object_info.h"
-#include "mc_mmu.h"
-#include "mc_unw.h"
-#include "mc_protocol.h"
-#include "mc_smx.h"
+#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"
+#include "src/mc/mc_smx.h"
#include "mc_hash.hpp"
+#include "src/mc/RegionSnapshot.hpp"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
+
using simgrid::mc::remote;
extern "C" {
/************************************ Free functions **************************************/
/*****************************************************************************************/
-static void MC_snapshot_stack_free_voidp(void *s)
-{
- mc_snapshot_stack_t stack = (mc_snapshot_stack_t) * (void **) s;
- delete stack;
-}
-
-static void local_variable_free_voidp(void *v)
-{
- local_variable_t var = *(local_variable_t*)v;
- delete var;
-}
-
-}
-
-extern "C" {
-
/** @brief Restore a region from a snapshot
*
* @param reg Target region
break;
case simgrid::mc::StorageType::Flat:
- mc_model_checker->process().write_bytes(region->flat_data().data(),
+ mc_model_checker->process().write_bytes(region->flat_data(),
region->size(), region->permanent_address());
break;
namespace simgrid {
namespace mc {
-simgrid::mc::RegionSnapshot privatized_region(
- RegionType region_type, void *start_addr, void* permanent_addr, size_t size
+#ifdef HAVE_SMPI
+RegionSnapshot privatized_region(
+ RegionType region_type, void *start_addr, void* permanent_addr,
+ std::size_t size, const RegionSnapshot* ref_region
)
{
size_t process_count = MC_smpi_process_count();
std::vector<simgrid::mc::RegionSnapshot> 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)
- );
+ 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];
+ data.push_back(simgrid::mc::region(region_type, start_addr,
+ privatisation_regions[i].address, size, ref_privatized_region));
+ }
simgrid::mc::RegionSnapshot region = simgrid::mc::RegionSnapshot(
region_type, start_addr, permanent_addr, size);
region.privatized_data(std::move(data));
return std::move(region);
}
+#endif
}
}
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)
+ simgrid::mc::ObjectInformation* object_info,
+ void *start_addr, void* permanent_addr,
+ std::size_t size)
{
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.");
- const bool privatization_aware = MC_object_info_is_privatized(object_info);
+ simgrid::mc::RegionSnapshot const* ref_region = nullptr;
+ if (mc_model_checker->parent_snapshot_)
+ ref_region = mc_model_checker->parent_snapshot_->snapshot_regions[index].get();
simgrid::mc::RegionSnapshot region;
+#ifdef HAVE_SMPI
+ const bool privatization_aware = object_info
+ && 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);
+ region = simgrid::mc::privatized_region(
+ type, start_addr, permanent_addr, size, ref_region);
else
- region = simgrid::mc::region(type, start_addr, permanent_addr, size);
+#endif
+ region = simgrid::mc::region(type, start_addr, permanent_addr, size, ref_region);
region.object_info(object_info);
snapshot->snapshot_regions[index]
return;
}
-static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t snapshot)
+static void MC_get_memory_regions(simgrid::mc::Process* process, mc_snapshot_t snapshot)
{
- const size_t n = process->object_infos_size;
+ const size_t n = process->object_infos.size();
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, simgrid::mc::RegionType::Data, object_info,
+ int i = 0;
+ for (auto const& object_info : process->object_infos) {
+ MC_snapshot_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();
process->get_malloc_info());
#ifdef HAVE_SMPI
- if (smpi_privatize_global_variables && MC_smpi_process_count()) {
+ 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,
*
* `dl_iterate_phdr` would be more robust but would not work in cross-process.
* */
-void MC_find_object_address(std::vector<simgrid::mc::VmMap> const& maps, mc_object_info_t result)
+void MC_find_object_address(
+ std::vector<simgrid::xbt::VmMap> const& maps,
+ simgrid::mc::ObjectInformation* result)
{
- const char *name = basename(result->file_name);
+ char* file_name = xbt_strdup(result->file_name.c_str());
+ const char *name = xbt_basename(file_name);
for (size_t i = 0; i < maps.size(); ++i) {
- simgrid::mc::VmMap const& reg = maps[i];
+ simgrid::xbt::VmMap const& reg = maps[i];
if (maps[i].pathname.empty()
- || strcmp(basename(maps[i].pathname.c_str()), name)) {
+ || strcmp(xbt_basename(maps[i].pathname.c_str()), name)) {
// Nothing to do
} else if ((reg.prot & PROT_WRITE)) {
xbt_assert(!result->start_rw,
result->start_rw = (char*) reg.start_addr;
result->end_rw = (char*) reg.end_addr;
// .bss is usually after the .data:
- simgrid::mc::VmMap const& next = maps[i + 1];
+ simgrid::xbt::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;
if (result->end_exec && (const void*) result->end_exec > result->end)
result->end = result->end_exec;
- xbt_assert(result->file_name);
xbt_assert(result->start_rw);
xbt_assert(result->start_exec);
+ free(file_name);
}
/************************************* Take Snapshot ************************************/
* \param ip Instruction pointer
* \return true if the variable is valid
* */
-static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
+static bool mc_valid_variable(simgrid::mc::Variable* var,
+ simgrid::mc::Frame* scope,
const void *ip)
{
// The variable is not yet valid:
- if ((const void *) ((const char *) scope->low_pc + var->start_scope) > ip)
+ if (scope->range.begin() + var->start_scope > (std::uint64_t) ip)
return false;
else
return true;
}
static void mc_fill_local_variables_values(mc_stack_frame_t stack_frame,
- dw_frame_t scope, int process_index,
+ simgrid::mc::Frame* scope,
+ int process_index,
std::vector<s_local_variable>& result)
{
- mc_process_t process = &mc_model_checker->process();
+ simgrid::mc::Process* process = &mc_model_checker->process();
- void *ip = (void *) stack_frame->ip;
- if (ip < scope->low_pc || ip >= scope->high_pc)
+ if (!scope->range.contain(stack_frame->ip))
return;
- unsigned cursor = 0;
- dw_variable_t current_variable;
- xbt_dynar_foreach(scope->variables, cursor, current_variable) {
+ for(simgrid::mc::Variable& current_variable :
+ scope->variables) {
- if (!mc_valid_variable(current_variable, scope, (void *) stack_frame->ip))
+ if (!mc_valid_variable(¤t_variable, scope, (void *) stack_frame->ip))
continue;
int 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.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;
- } else if (current_variable->locations.size != 0) {
- s_mc_location_t location;
- mc_dwarf_resolve_locations(
- &location, ¤t_variable->locations,
- current_variable->object_info,
- &(stack_frame->unw_cursor),
- (void *) stack_frame->frame_base,
- &mc_model_checker->process(), process_index);
-
- switch(mc_get_location_type(&location)) {
- case MC_LOCATION_TYPE_ADDRESS:
- new_var.address = location.memory_location;
- break;
- case MC_LOCATION_TYPE_REGISTER:
- default:
+ if (current_variable.address != NULL) {
+ new_var.address = current_variable.address;
+ } else if (!current_variable.location_list.empty()) {
+ simgrid::dwarf::Location location =
+ simgrid::dwarf::resolve(
+ current_variable.location_list,
+ current_variable.object_info,
+ &(stack_frame->unw_cursor),
+ (void *) stack_frame->frame_base,
+ &mc_model_checker->process(), process_index);
+
+ if (!location.in_memory())
xbt_die("Cannot handle non-address variable");
- }
+ new_var.address = location.address();
} else {
xbt_die("No address");
}
// Recursive processing of nested scopes:
- dw_frame_t nested_scope = NULL;
- xbt_dynar_foreach(scope->scopes, cursor, nested_scope) {
- mc_fill_local_variables_values(stack_frame, nested_scope, process_index, result);
- }
+ for(simgrid::mc::Frame& nested_scope : scope->scopes)
+ mc_fill_local_variables_values(
+ stack_frame, &nested_scope, process_index, result);
}
static std::vector<s_local_variable> MC_get_local_variables_values(
static std::vector<s_mc_stack_frame_t> MC_unwind_stack_frames(mc_unw_context_t stack_context)
{
- mc_process_t process = &mc_model_checker->process();
+ simgrid::mc::Process* process = &mc_model_checker->process();
std::vector<s_mc_stack_frame_t> result;
unw_cursor_t c;
// TODO, use real addresses in frame_t instead of fixing it here
- dw_frame_t frame = process->find_function(remote(ip));
+ simgrid::mc::Frame* frame = process->find_function(remote(ip));
stack_frame.frame = frame;
if (frame) {
stack_frame.frame_name = frame->name;
stack_frame.frame_base =
- (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c);
+ (unw_word_t) frame->frame_base(c);
} else {
stack_frame.frame_base = 0;
stack_frame.frame_name = std::string();
result.push_back(std::move(stack_frame));
/* Stop before context switch with maestro */
- if (frame != NULL && frame->name != NULL
- && !strcmp(frame->name, "smx_ctx_sysv_wrapper"))
+ if (frame != nullptr &&
+ frame->name == "smx_ctx_sysv_wrapper")
break;
int ret = unw_step(&c);
{
std::vector<s_mc_snapshot_stack_t> res;
- unsigned int cursor = 0;
- stack_region_t current_stack;
-
- // FIXME, cross-process support (stack_areas)
- xbt_dynar_foreach(stacks_areas, cursor, current_stack) {
+ for (auto const& stack : mc_model_checker->process().stack_areas()) {
s_mc_snapshot_stack_t st;
// Read the context from remote process:
unw_context_t context;
mc_model_checker->process().read_bytes(
- &context, sizeof(context), remote(current_stack->context));
+ &context, sizeof(context), remote(stack.context));
if (mc_unw_init_context(&st.context, &mc_model_checker->process(),
&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, current_stack->process_index);
- st.process_index = current_stack->process_index;
+ st.local_variables = MC_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;
res.push_back(std::move(st));
size_t stack_size =
- (char*) current_stack->address + current_stack->size - (char*) sp;
+ (char*) stack.address + stack.size - (char*) sp;
(*snapshot)->stack_sizes.push_back(stack_size);
}
}
-static std::vector<s_mc_heap_ignore_region_t> MC_take_snapshot_ignore()
-{
- std::vector<s_mc_heap_ignore_region_t> res;
-
- if (mc_heap_comparison_ignore == NULL)
- 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) {
- 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 std::move(res);
-}
-
static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
{
- xbt_assert(snapshot->process);
+ xbt_assert(snapshot->process());
// Copy the memory:
for (auto const& region : mc_model_checker->process().ignored_regions()) {
ignored_data.start = (void*)region.addr;
ignored_data.data.resize(region.size);
// TODO, we should do this once per privatization segment:
- snapshot->process->read_bytes(
+ snapshot->process()->read_bytes(
ignored_data.data.data(), region.size, remote(region.addr),
simgrid::mc::ProcessIndexDisabled);
snapshot->ignored_data.push_back(std::move(ignored_data));
// Zero the memory:
for(auto const& region : mc_model_checker->process().ignored_regions()) {
- snapshot->process->clear_bytes(remote(region.addr), region.size);
+ snapshot->process()->clear_bytes(remote(region.addr), region.size);
}
}
static void MC_snapshot_ignore_restore(mc_snapshot_t snapshot)
{
for (auto const& ignored_data : snapshot->ignored_data)
- snapshot->process->write_bytes(
+ snapshot->process()->write_bytes(
ignored_data.data.data(), ignored_data.data.size(),
remote(ignored_data.start));
}
struct dirent* fd_number;
while ((fd_number = readdir(fd_dir))) {
- int fd_value = atoi(fd_number->d_name);
+ int fd_value = xbt_str_parse_int(fd_number->d_name, "Found a non-numerical FD: %s. Freaking out!");
if(fd_value < 3)
continue;
}
link[res] = '\0';
+#ifdef HAVE_SMPI
if(smpi_is_privatisation_file(link))
continue;
+#endif
// This is (probably) the DIR* we are reading:
// TODO, read all the file entries at once and close the DIR.*
continue;
// If dot_output enabled, do not handle the corresponding file
- if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0)
+ if (dot_output != NULL && strcmp(xbt_basename(link), _sg_mc_dot_output_file) == 0)
continue;
// This is probably a shared memory used by lttng-ust:
{
XBT_DEBUG("Taking snapshot %i", num_state);
- mc_process_t mc_process = &mc_model_checker->process();
+ simgrid::mc::Process* mc_process = &mc_model_checker->process();
- mc_snapshot_t snapshot = new simgrid::mc::Snapshot();
+ mc_snapshot_t snapshot = new simgrid::mc::Snapshot(mc_process);
- snapshot->process = mc_process;
snapshot->num_state = num_state;
smx_process_t process;
if (_sg_mc_snapshot_fds)
snapshot->current_fds = MC_get_current_fds(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);
+ if (use_soft_dirty)
+ mc_process->reset_soft_dirty();
- snapshot->to_ignore = MC_take_snapshot_ignore();
+ snapshot->to_ignore = mc_model_checker->process().ignored_heap();
if (_sg_mc_visited > 0 || strcmp(_sg_mc_property_file, "")) {
snapshot->stacks =
MC_take_snapshot_stacks(&snapshot);
- if (_sg_mc_hash && !snapshot->stacks.empty()) {
- snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks);
+ if (_sg_mc_hash) {
+ snapshot->hash = simgrid::mc::hash(*snapshot);
} else {
snapshot->hash = 0;
}
}
MC_snapshot_ignore_restore(snapshot);
+ if (use_soft_dirty)
+ mc_model_checker->parent_snapshot_ = snapshot;
return snapshot;
}
#ifdef HAVE_SMPI
// TODO, send a message to implement this in the MCed process
if(snapshot->privatization_index >= 0) {
- // We just rewrote the global variables.
- // The privatisation segment SMPI thinks
- // is mapped might be inconsistent with the segment which
- // is really mapped in memory (kernel state).
- // We ask politely SMPI to map the segment anyway,
- // even if it thinks it is the current one:
- smpi_really_switch_data_segment(snapshot->privatization_index);
+ // 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);
}
#endif
}
void MC_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);
if (_sg_mc_snapshot_fds)
MC_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;
+ if (use_soft_dirty)
+ mc_model_checker->parent_snapshot_ = snapshot;
}
mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
