-/* Copyright (c) 2008-2014. 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
#include <unistd.h>
-#include <string.h>
-#include <link.h>
+#include <cstring>
#include <dirent.h>
+#include <fcntl.h>
+#include <link.h>
+
+#ifndef WIN32
+#include <sys/mman.h>
+#endif
-#include "internal_config.h"
-#include "mc_memory_map.h"
-#include "mc_private.h"
+#include "src/internal_config.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 <xbt/mmalloc.h>
-#include "../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.hpp"
#include <libunwind.h>
#include <libelf.h>
-#include "mc_private.h"
+#include "src/mc/mc_private.hpp"
#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_hash.hpp"
+#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"
+#include "src/mc/ObjectInformation.hpp"
+#include "src/mc/Frame.hpp"
+#include "src/mc/Variable.hpp"
using simgrid::mc::remote;
-extern "C" {
+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)
+extern std::string _sg_mc_property_file;
+extern std::string _sg_mc_dot_output_file;
-XBT_LOG_NEW_DEFAULT_SUBCATEGORY(mc_checkpoint, mc,
- "Logging specific to mc_checkpoint");
+namespace simgrid {
+namespace mc {
/************************************ Free functions **************************************/
/*****************************************************************************************/
-static void MC_snapshot_stack_free(mc_snapshot_stack_t s)
-{
- 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);
- }
-}
-
-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);
-}
-
-static void local_variable_free_voidp(void *v)
-{
- local_variable_free((local_variable_t) * (void **) v);
-}
-
-}
-
-extern "C" {
-
/** @brief Restore a region from a snapshot
*
- * @param reg Target region
+ * @param region 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:
- default:
- xbt_die("Storage type not supported");
- 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().get(),
region->size(), region->permanent_address());
break;
case simgrid::mc::StorageType::Privatized:
for (auto& p : region->privatized_data())
- MC_region_restore(&p);
+ restore(&p);
break;
- }
-}
+ default: // includes StorageType::NoData
+ xbt_die("Storage type not supported");
+ break;
+ }
}
-namespace simgrid {
-namespace mc {
-
-simgrid::mc::RegionSnapshot privatized_region(
- RegionType region_type, void *start_addr, void* permanent_addr, size_t size
+#if HAVE_SMPI
+RegionSnapshot privatized_region(
+ RegionType region_type, void *start_addr, void* permanent_addr,
+ std::size_t size
)
{
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<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)
- );
+ data.push_back(simgrid::mc::region(region_type, start_addr,
+ privatization_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
-extern "C" {
-
-static void MC_snapshot_add_region(int index, mc_snapshot_t snapshot,
+static
+void add_region(int index, simgrid::mc::Snapshot* 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);
+ xbt_assert(not object_info, "Unexpected object info for heap region.");
simgrid::mc::RegionSnapshot region;
+#if 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);
else
+#endif
region = simgrid::mc::region(type, start_addr, permanent_addr, size);
region.object_info(object_info);
snapshot->snapshot_regions[index]
- = new simgrid::mc::RegionSnapshot(std::move(region));
- return;
+ = std::unique_ptr<simgrid::mc::RegionSnapshot>(
+ new simgrid::mc::RegionSnapshot(std::move(region)));
}
-static void MC_get_memory_regions(mc_process_t process, mc_snapshot_t 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_count = n + 1;
- snapshot->snapshot_regions = xbt_new0(mc_mem_region_t, 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,
+ 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)
+ 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);
- }
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 (smpi_privatize_global_variables && 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(std::vector<simgrid::mc::VmMap> const& maps, mc_object_info_t result)
+// TODO, use the ELF segment information for more robustness
+void find_object_address(
+ std::vector<simgrid::xbt::VmMap> const& maps,
+ simgrid::mc::ObjectInformation* result)
{
- const char *name = basename(result->file_name);
+ std::string name = simgrid::xbt::Path(result->file_name).getBasename();
+
for (size_t i = 0; i < maps.size(); ++i) {
- simgrid::mc::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)) {
- xbt_assert(!result->start_rw,
- "Multiple read-write segments for %s, not supported",
- maps[i].pathname.c_str());
+ simgrid::xbt::VmMap const& reg = maps[i];
+ if (maps[i].pathname.empty())
+ continue;
+ std::string map_basename = simgrid::xbt::Path(maps[i].pathname).getBasename();
+ if (map_basename != name)
+ continue;
+
+ // This is the non-GNU_RELRO-part of the data segment:
+ if (reg.prot == PROT_RW) {
+ 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;
- // .bss is usually after the .data:
- simgrid::mc::VmMap const& next = maps[i + 1];
- if (next.pathname.empty() && (next.prot & PROT_WRITE)
- && next.start_addr == reg.end_addr) {
+
+ // The next VMA might be end of the data segment:
+ if (i + 1 < maps.size()
+ && maps[i + 1].pathname.empty()
+ && maps[i + 1].prot == PROT_RW
+ && maps[i + 1].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",
+ }
+
+ // This is the text segment:
+ else if (reg.prot == PROT_RX) {
+ 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;
- } else if ((reg.prot & PROT_READ) && !(reg.prot & PROT_EXEC)) {
- xbt_assert(!result->start_ro,
- "Multiple read only segments for %s, not supported",
- maps[i].pathname.c_str());
+
+ // The next VMA might be end of the data segment:
+ if (i + 1 < maps.size()
+ && maps[i + 1].pathname.empty()
+ && maps[i + 1].prot == PROT_RW
+ && maps[i + 1].start_addr == reg.end_addr) {
+ result->start_rw = (char*) maps[i + 1].start_addr;
+ result->end_rw = (char*) maps[i + 1].end_addr;
+ }
+ }
+
+ // This is the GNU_RELRO-part of the data segment:
+ else if (reg.prot == PROT_READ) {
+ 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;
- xbt_assert(result->file_name);
- xbt_assert(result->start_rw);
- xbt_assert(result->start_exec);
+ xbt_assert(result->start_exec || result->start_rw || result->start_ro);
}
/************************************* Take Snapshot ************************************/
* 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
* */
-static bool mc_valid_variable(dw_variable_t var, dw_frame_t scope,
+static bool 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, xbt_dynar_t result)
+static void fill_local_variables_values(mc_stack_frame_t stack_frame, simgrid::mc::Frame* scope, int process_index,
+ std::vector<s_local_variable_t>& result)
{
- mc_process_t process = &mc_model_checker->process();
+ simgrid::mc::RemoteClient* process = &mc_model_checker->process();
- void *ip = (void *) stack_frame->ip;
- if (ip < scope->low_pc || ip >= scope->high_pc)
+ if (not scope || not 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 (not valid_variable(¤t_variable, scope, (void*)stack_frame->ip))
continue;
int region_type;
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;
-
- 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:
+ 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 != nullptr)
+ new_var.address = current_variable.address;
+ else if (not 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 (not location.in_memory())
xbt_die("Cannot handle non-address variable");
- }
+ new_var.address = location.address();
- } else {
+ } else
xbt_die("No address");
- }
- xbt_dynar_push(result, &new_var);
+ result.push_back(std::move(new_var));
}
// 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)
+ fill_local_variables_values(
+ stack_frame, &nested_scope, process_index, result);
}
-static xbt_dynar_t MC_get_local_variables_values(xbt_dynar_t stack_frames, int process_index)
+static std::vector<s_local_variable_t> get_local_variables_values(std::vector<s_mc_stack_frame_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);
-
- xbt_dynar_foreach(stack_frames, cursor1, stack_frame) {
- mc_fill_local_variables_values(stack_frame, stack_frame->frame, process_index, variables);
- }
-
+ std::vector<s_local_variable_t> 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;
}
-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);
- }
-}
-
-static xbt_dynar_t MC_unwind_stack_frames(mc_unw_context_t stack_context)
+static std::vector<s_mc_stack_frame_t> unwind_stack_frames(simgrid::mc::UnwindContext* stack_context)
{
- mc_process_t process = &mc_model_checker->process();
- xbt_dynar_t result =
- xbt_dynar_new(sizeof(mc_stack_frame_t), MC_stack_frame_free_voipd);
+ simgrid::mc::RemoteClient* process = &mc_model_checker->process();
+ std::vector<s_mc_stack_frame_t> result;
- unw_cursor_t c;
+ unw_cursor_t c = stack_context->cursor();
// TODO, check condition check (unw_init_local==0 means end of frame)
- if (mc_unw_init_cursor(&c, stack_context) != 0) {
-
- xbt_die("Could not initialize stack unwinding");
- } else
while (1) {
- mc_stack_frame_t stack_frame = xbt_new(s_mc_stack_frame_t, 1);
- xbt_dynar_push(result, &stack_frame);
+ s_mc_stack_frame_t stack_frame;
- stack_frame->unw_cursor = c;
+ 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);
- stack_frame->ip = ip;
- stack_frame->sp = sp;
+ stack_frame.ip = ip;
+ stack_frame.sp = sp;
// TODO, use real addresses in frame_t instead of fixing it here
- dw_frame_t frame = process->find_function(remote(ip));
- stack_frame->frame = frame;
+ simgrid::mc::Frame* frame = process->find_function(remote(ip));
+ stack_frame.frame = frame;
if (frame) {
- stack_frame->frame_name = xbt_strdup(frame->name);
- stack_frame->frame_base =
- (unw_word_t) mc_find_frame_base(frame, frame->object_info, &c);
+ stack_frame.frame_name = frame->name;
+ stack_frame.frame_base =
+ (unw_word_t) frame->frame_base(c);
} else {
- stack_frame->frame_base = 0;
- stack_frame->frame_name = NULL;
+ 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);
- 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 (xbt_dynar_length(result) == 0) {
+ if (result.empty()) {
XBT_INFO("unw_init_local failed");
xbt_abort();
}
return result;
-};
+}
-static xbt_dynar_t MC_take_snapshot_stacks(mc_snapshot_t * snapshot)
+static std::vector<s_mc_snapshot_stack_t> take_snapshot_stacks(simgrid::mc::Snapshot* snapshot)
{
+ std::vector<s_mc_snapshot_stack_t> res;
- xbt_dynar_t res =
- xbt_dynar_new(sizeof(s_mc_snapshot_stack_t),
- MC_snapshot_stack_free_voidp);
-
- unsigned int cursor = 0;
- stack_region_t current_stack;
-
- // 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);
+ 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));
- st->context = xbt_new0(s_mc_unw_context_t, 1);
- 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.context.initialize(&mc_model_checker->process(), &context);
- unw_word_t sp = xbt_dynar_get_as(st->stack_frames, 0, mc_stack_frame_t)->sp;
+ 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;
- xbt_dynar_push(res, &st);
- (*snapshot)->stack_sizes = (size_t*)
- xbt_realloc((*snapshot)->stack_sizes, (cursor + 1) * sizeof(size_t));
- (*snapshot)->stack_sizes[cursor] =
- (char*) current_stack->address + current_stack->size - (char*) sp;
- }
+ unw_word_t sp = st.stack_frames[0].sp;
- return res;
+ res.push_back(std::move(st));
-}
-
-static xbt_dynar_t MC_take_snapshot_ignore()
-{
-
- 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);
-
- 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);
+ size_t stack_size =
+ (char*) stack.address + stack.size - (char*) sp;
+ snapshot->stack_sizes.push_back(stack_size);
}
- return cpy;
-
-}
+ return res;
-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);
}
-static void MC_snapshot_handle_ignore(mc_snapshot_t snapshot)
+static void snapshot_handle_ignore(simgrid::mc::Snapshot* snapshot)
{
- xbt_assert(snapshot->process);
- snapshot->ignored_data = xbt_dynar_new(sizeof(s_mc_snapshot_ignored_data_t), mc_free_snapshot_ignored_data_pvoid);
+ 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;
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),
+ snapshot->process()->read_bytes(
+ 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:
- for(auto const& region : mc_model_checker->process().ignored_regions()) {
- snapshot->process->clear_bytes(remote(region.addr), region.size);
- }
+ 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(simgrid::mc::Snapshot* 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<s_fd_infos_t> 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");
DIR* fd_dir = opendir(fd_dir_path);
- if (fd_dir == NULL)
+ if (fd_dir == nullptr)
xbt_die("Cannot open directory '/proc/self/fd'\n");
- size_t total_fd = 0;
+ std::vector<s_fd_infos_t> fds;
+
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;
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);
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';
- if(smpi_is_privatisation_file(link))
+#if HAVE_SMPI
+ if(smpi_is_privatization_file(link))
continue;
+#endif
// This is (probably) the DIR* we are reading:
// TODO, read all the file entries at once and close the DIR.*
// 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
- if (dot_output != NULL && strcmp(basename(link), _sg_mc_dot_output_file) == 0)
- continue;
+ if (dot_output != nullptr) {
+ std::string link_basename = simgrid::xbt::Path(link).getBasename();
+ if (link_basename == _sg_mc_dot_output_file)
+ continue;
+ }
// 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:
- 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 fds;
}
-mc_snapshot_t MC_take_snapshot(int num_state)
+std::shared_ptr<simgrid::mc::Snapshot> take_snapshot(int num_state)
{
XBT_DEBUG("Taking snapshot %i", num_state);
- mc_process_t mc_process = &mc_model_checker->process();
-
- mc_snapshot_t snapshot = new simgrid::mc::Snapshot();
+ simgrid::mc::RemoteClient* mc_process = &mc_model_checker->process();
- snapshot->process = mc_process;
- snapshot->num_state = num_state;
+ std::shared_ptr<simgrid::mc::Snapshot> snapshot = std::make_shared<simgrid::mc::Snapshot>(mc_process, num_state);
- smx_process_t process;
- MC_EACH_SIMIX_PROCESS(process,
- snapshot->enabled_processes.insert(process->pid));
+ for (auto const& p : mc_model_checker->process().actors())
+ snapshot->enabled_processes.insert(p.copy.getBuffer()->pid);
- MC_snapshot_handle_ignore(snapshot);
+ snapshot_handle_ignore(snapshot.get());
if (_sg_mc_snapshot_fds)
- MC_get_current_fd(snapshot);
+ snapshot->current_fds = get_current_fds(mc_model_checker->process().pid());
/* 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.get());
- 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 != NULL) {
- snapshot->hash = mc_hash_processes_state(num_state, snapshot->stacks);
- } else {
+ if (_sg_mc_max_visited_states > 0 || not _sg_mc_property_file.empty()) {
+ snapshot->stacks = take_snapshot_stacks(snapshot.get());
+ if (_sg_mc_hash)
+ snapshot->hash = simgrid::mc::hash(*snapshot);
+ else
snapshot->hash = 0;
- }
- } else {
+ } else
snapshot->hash = 0;
- }
- MC_snapshot_ignore_restore(snapshot);
+ snapshot_ignore_restore(snapshot.get());
return snapshot;
}
static inline
-void MC_restore_snapshot_regions(mc_snapshot_t snapshot)
+void restore_snapshot_regions(simgrid::mc::Snapshot* snapshot)
{
- const size_t n = snapshot->snapshot_regions_count;
- for (size_t i = 0; i < n; i++) {
+ for (std::unique_ptr<s_mc_mem_region_t> 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)
+ restore(region.get());
}
-#ifdef HAVE_SMPI
- // TODO, send a message to implement this in the MCed process
+#if HAVE_SMPI
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_message_restore_t message{MC_MESSAGE_RESTORE, snapshot->privatization_index};
+ mc_model_checker->process().getChannel().send(message);
}
#endif
}
static inline
-void MC_restore_snapshot_fds(mc_snapshot_t snapshot)
+void restore_snapshot_fds(simgrid::mc::Snapshot* 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++) {
-
- new_fd = open(snapshot->current_fd[i]->filename, snapshot->current_fd[i]->flags);
- if (new_fd <0) {
- xbt_die("Could not reopen the file %s fo restoring the file descriptor",
- snapshot->current_fd[i]->filename);
- }
- 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"));
+ 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());
+ 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);
}
}
-void MC_restore_snapshot(mc_snapshot_t snapshot)
+void restore_snapshot(std::shared_ptr<simgrid::mc::Snapshot> snapshot)
{
XBT_DEBUG("Restore snapshot %i", snapshot->num_state);
- MC_restore_snapshot_regions(snapshot);
+ restore_snapshot_regions(snapshot.get());
if (_sg_mc_snapshot_fds)
- MC_restore_snapshot_fds(snapshot);
- MC_snapshot_ignore_restore(snapshot);
- mc_model_checker->process().cache_flags = 0;
+ restore_snapshot_fds(snapshot.get());
+ snapshot_ignore_restore(snapshot.get());
+ mc_model_checker->process().clear_cache();
}
-mc_snapshot_t simcall_HANDLER_mc_snapshot(smx_simcall_t simcall)
-{
- return MC_take_snapshot(1);
}
-
}